mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6086) -Fix: InteractiveRandom was not seeded properly resulting in the dedicated server always generating the same map. Thanks to the #openttdcoop team for detecting.

release/0.5
rubidium 2006-08-24 10:19:59 +00:00
parent e9443f0d7a
commit d14ac4478d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os2.c
View File

@ -125,8 +125,7 @@ int CDECL main(int argc, char* argv[])
// change the working directory to enable doubleclicking in UIs // change the working directory to enable doubleclicking in UIs
ChangeWorkingDirectory(argv[0]); ChangeWorkingDirectory(argv[0]);
_random_seeds[0][1] = _random_seeds[0][0] = time(NULL); _random_seeds[1][1] = _random_seeds[1][0] = _random_seeds[0][1] = _random_seeds[0][0] = time(NULL);
return ttd_main(argc, argv); return ttd_main(argc, argv);
} }

2
unix.c
View File

@ -151,7 +151,7 @@ int CDECL main(int argc, char* argv[])
ChangeWorkingDirectory(argv[0]); ChangeWorkingDirectory(argv[0]);
#endif #endif
_random_seeds[0][1] = _random_seeds[0][0] = time(NULL); _random_seeds[1][1] = _random_seeds[1][0] = _random_seeds[0][1] = _random_seeds[0][0] = time(NULL);
SeedMT(_random_seeds[0][1]); SeedMT(_random_seeds[0][1]);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);

4
win32.c
View File

@ -859,8 +859,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
_set_error_mode(_OUT_TO_MSGBOX); // force assertion output to messagebox _set_error_mode(_OUT_TO_MSGBOX); // force assertion output to messagebox
// setup random seed to something quite random // setup random seed to something quite random
_random_seeds[0][0] = GetTickCount(); _random_seeds[1][0] = _random_seeds[0][0] = GetTickCount();
_random_seeds[0][1] = _random_seeds[0][0] * 0x1234567; _random_seeds[1][1] = _random_seeds[0][1] = _random_seeds[0][0] * 0x1234567;
SeedMT(_random_seeds[0][0]); SeedMT(_random_seeds[0][0]);
argc = ParseCommandLine(GetCommandLine(), argv, lengthof(argv)); argc = ParseCommandLine(GetCommandLine(), argv, lengthof(argv));