diff options
| author | orudge <orudge@openttd.org> | 2005-07-22 16:14:24 +0000 |
|---|---|---|
| committer | orudge <orudge@openttd.org> | 2005-07-22 16:14:24 +0000 |
| commit | c50223526ce416144495b3c5746e1e2de3d5371b (patch) | |
| tree | a0920f396db4a75b428759305e9804a19c174e68 | |
| parent | 1b6ff121f4b8c07311d1022392f85e58db41aea0 (diff) | |
| download | openttd-c50223526ce416144495b3c5746e1e2de3d5371b.tar.xz | |
(svn r2681) - Fix OS/2 port, please do not modify openttd.wpj/tgt by hand unless you know what you're doing!
| -rw-r--r-- | misc_gui.c | 7 | ||||
| -rw-r--r-- | openttd.tgt | 10 | ||||
| -rw-r--r-- | os/os2/openttd.wpj | 4 | ||||
| -rw-r--r-- | os2.c | 12 |
4 files changed, 22 insertions, 11 deletions
diff --git a/misc_gui.c b/misc_gui.c index 9a9aa8f5d..195f3d293 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -90,10 +90,9 @@ static void LandInfoWndProc(Window *w, WindowEvent *e) // If the accepted value is less than 8, show it in 1/8:ths if (lid->ac[i] < 8) { - int32 argv[2] = { - lid->ac[i], - _cargoc.names_s[i] - }; + int32 argv[2]; + argv[0] = lid->ac[i]; + argv[1] = _cargoc.names_s[i]; p = GetStringWithArgs(p, STR_01D1_8, argv); } else { p = GetString(p, _cargoc.names_s[i]); diff --git a/openttd.tgt b/openttd.tgt index 89d7ba8ad..fdb7045e8 100644 --- a/openttd.tgt +++ b/openttd.tgt @@ -411,8 +411,8 @@ WVList 0 105 MItem -4 -ai_old.c +10 +ai_build.c 106 WString 4 @@ -429,8 +429,8 @@ WVList 0 109 MItem -10 -ai_build.c +8 +ai_new.c 110 WString 4 @@ -448,7 +448,7 @@ WVList 113 MItem 8 -ai_new.c +ai_old.c 114 WString 4 diff --git a/os/os2/openttd.wpj b/os/os2/openttd.wpj index 250e205fd..077e36333 100644 --- a/os/os2/openttd.wpj +++ b/os/os2/openttd.wpj @@ -43,8 +43,8 @@ WRect WFileName 17 ..\..\openttd.tgt -42 -66 +0 +18 11 VComponent 12 @@ -1,11 +1,15 @@ #include "stdafx.h" #include "openttd.h" +#include "variables.h" #include "window.h" #include "string.h" #include "table/strings.h" #include "hal.h" #include "gfx.h" #include "gui.h" +#include "saveload.h" +#include "functions.h" +#include "macros.h" #include <direct.h> #include <unistd.h> @@ -25,6 +29,8 @@ #include <os2.h> #include <os2me.h> +#include <i86.h> + #if defined(WITH_SDL) #include <SDL.h> #endif @@ -772,3 +778,9 @@ void JoinOTTDThread(void) DosWaitThread(&thread1, DCWW_WAIT); } + +void CSleep(int milliseconds) +{ + delay(milliseconds); +} + |