gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r1399) -Fix: Fixes for compiling with Watcom C/C++ (ie, OS/2 port). (orudge)

Browse Source 
Note: If people could watch out for initialising structs with
  *non-constants* in future... it's a bit annoying, I
  know, but Open Watcom isn't the only compiler which
  doesn't support this (yet) - Borland, for example,
  still doesn't like it.
This commit is contained in:
truelight 2005-01-06 15:57:26 +00:00
parent becd9c224e
commit c06dd27c33
3 changed files with 398 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

786
openttd.tgt
View File

File diff suppressed because it is too large Load Diff

2
os/os2/openttd.wpj
View File

@ -43,7 +43,7 @@ WFileName
17 17
..\..\openttd.tgt ..\..\openttd.tgt
47 47
47 49
11 11
VComponent VComponent
12 12

20
vehicle_gui.c
View File

@ -357,11 +357,14 @@ static void SetupScrollStuffForReplaceWindow(Window *w)
{ {
byte railtype; byte railtype;
int selected_id[2] = {-1,-1}; int selected_id[2] = {-1,-1};
int sel[2] = { WP(w,replaceveh_d).sel_index[0], WP(w,replaceveh_d).sel_index[1]}; int sel[2];
int count = 0; int count = 0;
int count2 = 0; int count2 = 0;
int engine_id; int engine_id;
sel[0] = WP(w,replaceveh_d).sel_index[0];
sel[1] = WP(w,replaceveh_d).sel_index[1];
switch (WP(w,replaceveh_d).vehicletype) { switch (WP(w,replaceveh_d).vehicletype) {
case VEH_Train: { case VEH_Train: {
railtype = WP(w,replaceveh_d).railtype; railtype = WP(w,replaceveh_d).railtype;
@ -502,8 +505,15 @@ static void SetupScrollStuffForReplaceWindow(Window *w)
static void DrawEngineArrayInReplaceWindow(Window *w, int x, int y, int x2, int y2, int pos, int pos2, static void DrawEngineArrayInReplaceWindow(Window *w, int x, int y, int x2, int y2, int pos, int pos2,
int sel1, int sel2, int selected_id1, int selected_id2) int sel1, int sel2, int selected_id1, int selected_id2)
{ {
int sel[2] = {sel1, sel2}; int sel[2];
int selected_id[2] = {selected_id1, selected_id2}; int selected_id[2];
sel[0] = sel1;
sel[1] = sel2;
selected_id[0] = selected_id1;
selected_id[1] = selected_id2;
switch (WP(w,replaceveh_d).vehicletype) { switch (WP(w,replaceveh_d).vehicletype) {
case VEH_Train: { case VEH_Train: {
byte railtype = WP(w,replaceveh_d).railtype; byte railtype = WP(w,replaceveh_d).railtype;
@ -644,7 +654,9 @@ static void ReplaceVehicleWndProc(Window *w, WindowEvent *e)
int pos2 = w->vscroll2.pos; int pos2 = w->vscroll2.pos;
int x2 = 1 + 228; int x2 = 1 + 228;
int y2 = 15; int y2 = 15;
int sel[2] = { WP(w,replaceveh_d).sel_index[0], WP(w,replaceveh_d).sel_index[1]}; int sel[2];
sel[0] = WP(w,replaceveh_d).sel_index[0];
sel[1] = WP(w,replaceveh_d).sel_index[1];
SetupScrollStuffForReplaceWindow(w); SetupScrollStuffForReplaceWindow(w);