summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2006-08-24 10:19:59 +0000
committerrubidium <rubidium@openttd.org>2006-08-24 10:19:59 +0000
commitd14ac4478d35f7ae9b7ced6e78673a27a85fc878 (patch)
tree495f01b0b0c73eb75ae04baf11bd52020619fb18
parente9443f0d7ae7b06bb8daac7aec18c11a46f4a31d (diff)
downloadopenttd-d14ac4478d35f7ae9b7ced6e78673a27a85fc878.tar.xz
(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.
-rw-r--r--os2.c3
-rw-r--r--unix.c2
-rw-r--r--win32.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/os2.c b/os2.c
index 91531eb58..de8cc661e 100644
--- a/os2.c
+++ b/os2.c
@@ -125,8 +125,7 @@ int CDECL main(int argc, char* argv[])
// change the working directory to enable doubleclicking in UIs
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);
}
diff --git a/unix.c b/unix.c
index 9127f800d..97d287bea 100644
--- a/unix.c
+++ b/unix.c
@@ -151,7 +151,7 @@ int CDECL main(int argc, char* argv[])
ChangeWorkingDirectory(argv[0]);
#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]);
signal(SIGPIPE, SIG_IGN);
diff --git a/win32.c b/win32.c
index 48c50027c..6c692dced 100644
--- a/win32.c
+++ b/win32.c
@@ -859,8 +859,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
_set_error_mode(_OUT_TO_MSGBOX); // force assertion output to messagebox
// setup random seed to something quite random
- _random_seeds[0][0] = GetTickCount();
- _random_seeds[0][1] = _random_seeds[0][0] * 0x1234567;
+ _random_seeds[1][0] = _random_seeds[0][0] = GetTickCount();
+ _random_seeds[1][1] = _random_seeds[0][1] = _random_seeds[0][0] * 0x1234567;
SeedMT(_random_seeds[0][0]);
argc = ParseCommandLine(GetCommandLine(), argv, lengthof(argv));