@@ -293,25 +293,27 @@ static void LoadIntroGame(void)
#endif
GenerateWorld(1, 64, 64); // if failed loading, make empty world.
}
_pause = 0;
_local_player = 0;
MarkWholeScreenDirty();
// Play main theme
if (_music_driver->is_song_playing()) ResetMusic();
#if defined(UNIX) && !defined(__MORPHOS__)
extern void DedicatedFork(void);
extern void CheckExternalFiles(void);
int ttd_main(int argc, char* argv[])
{
MyGetOptData mgo;
int i;
bool network = false;
char *network_conn = NULL;
char *language = NULL;
const char *optformat;
char musicdriver[16], sounddriver[16], videodriver[16];
int resolution[2] = {0,0};
@@ -408,25 +410,25 @@ int ttd_main(int argc, char* argv[])
#ifdef GPMI
/* Set the debug proc */
gpmi_debug_proc = &gpmi_debug_openttd;
/* Initialize GPMI */
gpmi_init();
/* Add our paths so we can find our own packages */
gpmi_path_append(&gpmi_path_modules, "gpmi/modules");
gpmi_path_append(&gpmi_path_packages, "gpmi/packages");
#endif /* GPMI */
#ifdef UNIX
// We must fork here, or we'll end up without some resources we need (like sockets)
if (_dedicated_forks)
DedicatedFork();
LoadFromConfig();
CheckConfig();
LoadFromHighScore();
// override config?
if (musicdriver[0]) ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver));
if (sounddriver[0]) ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver));
/* $Id$ */
#include "stdafx.h"
#include "thread.h"
#include <stdlib.h>
#if defined(__AMIGA__) || defined(__MORPHOS__)
Thread* OTTDCreateThread(ThreadFunc function, void* arg) { return NULL; }
void* OTTDJoinThread(Thread*) { return NULL; }
void* OTTDJoinThread(Thread* t) { return NULL; }
#elif defined(__OS2__)
#define INCL_DOS
#include <os2.h>
#include <process.h>
struct Thread {
TID thread;
ThreadFunc func;
void* arg;
Status change: