1
0
Fork 0

(svn r2681) - Fix OS/2 port, please do not modify openttd.wpj/tgt by hand unless you know what you're doing!

release/0.4.5
orudge 2005-07-22 16:14:24 +00:00
parent 1b6ff121f4
commit c50223526c
4 changed files with 22 additions and 11 deletions

View File

@ -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 the accepted value is less than 8, show it in 1/8:ths
if (lid->ac[i] < 8) { if (lid->ac[i] < 8) {
int32 argv[2] = { int32 argv[2];
lid->ac[i], argv[0] = lid->ac[i];
_cargoc.names_s[i] argv[1] = _cargoc.names_s[i];
};
p = GetStringWithArgs(p, STR_01D1_8, argv); p = GetStringWithArgs(p, STR_01D1_8, argv);
} else { } else {
p = GetString(p, _cargoc.names_s[i]); p = GetString(p, _cargoc.names_s[i]);

View File

@ -411,8 +411,8 @@ WVList
0 0
105 105
MItem MItem
4 10
ai_old.c ai_build.c
106 106
WString WString
4 4
@ -429,8 +429,8 @@ WVList
0 0
109 109
MItem MItem
10 8
ai_build.c ai_new.c
110 110
WString WString
4 4
@ -448,7 +448,7 @@ WVList
113 113
MItem MItem
8 8
ai_new.c ai_old.c
114 114
WString WString
4 4

View File

@ -43,8 +43,8 @@ WRect
WFileName WFileName
17 17
..\..\openttd.tgt ..\..\openttd.tgt
42 0
66 18
11 11
VComponent VComponent
12 12

12
os2.c
View File

@ -1,11 +1,15 @@
#include "stdafx.h" #include "stdafx.h"
#include "openttd.h" #include "openttd.h"
#include "variables.h"
#include "window.h" #include "window.h"
#include "string.h" #include "string.h"
#include "table/strings.h" #include "table/strings.h"
#include "hal.h" #include "hal.h"
#include "gfx.h" #include "gfx.h"
#include "gui.h" #include "gui.h"
#include "saveload.h"
#include "functions.h"
#include "macros.h"
#include <direct.h> #include <direct.h>
#include <unistd.h> #include <unistd.h>
@ -25,6 +29,8 @@
#include <os2.h> #include <os2.h>
#include <os2me.h> #include <os2me.h>
#include <i86.h>
#if defined(WITH_SDL) #if defined(WITH_SDL)
#include <SDL.h> #include <SDL.h>
#endif #endif
@ -772,3 +778,9 @@ void JoinOTTDThread(void)
DosWaitThread(&thread1, DCWW_WAIT); DosWaitThread(&thread1, DCWW_WAIT);
} }
void CSleep(int milliseconds)
{
delay(milliseconds);
}