diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index d57c119d8..03cd67e22 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -12,4 +12,4 @@ ADD_SUBDIRECTORY(raceengine) ADD_SUBDIRECTORY(learning) ADD_SUBDIRECTORY(math) ADD_SUBDIRECTORY(portability) -ADD_SUBDIRECTORY(metar) +#ADD_SUBDIRECTORY(metar) diff --git a/src/libs/math/sg_random.c b/src/libs/math/sg_random.c index 6533d1025..697b99d14 100644 --- a/src/libs/math/sg_random.c +++ b/src/libs/math/sg_random.c @@ -66,10 +66,6 @@ email: matumoto@math.keio.ac.jp */ -#ifdef HAVE_CONFIG_H -# include -#endif - #include #include // for random(), srandom() #include // for time() to seed srandom() @@ -91,6 +87,7 @@ static int initf = 0; static unsigned long *next; /* initializes state[N] with a seed */ + void init_genrand(unsigned long s) { int j; @@ -129,27 +126,35 @@ static void next_state(void) // Seed the random number generater with time() so we don't see the // same sequence every time -void sg_srandom_time() { + +void sg_srandom_time() +{ init_genrand(time(NULL)); } // Seed the random number generater with time() in 10 minute intervals // so we get the same sequence within 10 minutes interval. // This is useful for synchronizing two display systems. -void sg_srandom_time_10() { + +void sg_srandom_time_10() +{ init_genrand(time(NULL) / 600); } // Seed the random number generater with your own seed so can set up // repeatable randomization. -void sg_srandom( unsigned int seed ) { + +void sg_srandom( unsigned int seed ) +{ init_genrand( seed ); } // return a random number between [0.0, 1.0) -double sg_random() { + +double sg_random() +{ unsigned long y; if (--left == 0) diff --git a/src/modules/userinterface/legacymenu/legacymenu.cpp b/src/modules/userinterface/legacymenu/legacymenu.cpp index 6dceb438d..3972bec80 100644 --- a/src/modules/userinterface/legacymenu/legacymenu.cpp +++ b/src/modules/userinterface/legacymenu/legacymenu.cpp @@ -74,7 +74,7 @@ LegacyMenu& LegacyMenu::self() { } LegacyMenu::LegacyMenu(const std::string& strShLibName, void* hShLibHandle) -: GfModule(strShLibName, hShLibHandle), _piRaceEngine(0), _piGraphicsEngine(0), +: GfModule(strShLibName, hShLibHandle), _piRaceEngine(0), _piGraphicsEngine(0), _piSoundEngine(0), _hscrReUpdateStateHook(0), _hscrGame(0), _bfGraphicsState(0) { }