Browse Source

rename DeleteObject to DeleteObject_ to avoid collision with windows.h

pull/25/head
Robin Eklind 7 years ago committed by Anders Jenbo
parent
commit
a94ac659a7
  1. 4
      Source/objects.cpp
  2. 2
      Source/objects.h

4
Source/objects.cpp

@ -1522,7 +1522,7 @@ void __fastcall SetMapObjects(unsigned char *pMap, int startx, int starty)
// 67D7C4: using guessed type int numobjfiles;
// 4427C5: using guessed type int var_10C[56];
void __fastcall DeleteObject(int oi, int i)
void __fastcall DeleteObject_(int oi, int i)
{
int v2; // eax
BOOLEAN v3; // zf
@ -2683,7 +2683,7 @@ LABEL_45:
v6 = 0;
while (v6 < nobjects) {
if (object[objectactive[v6]]._oDelFlag) {
DeleteObject(objectactive[v6], v6);
DeleteObject_(objectactive[v6], v6);
v6 = 0;
} else {
++v6;

2
Source/objects.h

@ -42,7 +42,7 @@ void __cdecl AddL4Goodies();
void __cdecl AddLazStand();
void __cdecl InitObjects();
void __fastcall SetMapObjects(unsigned char *pMap, int startx, int starty);
void __fastcall DeleteObject(int oi, int i);
void __fastcall DeleteObject_(int oi, int i);
void __fastcall SetupObject(int i, int x, int y, int ot);
void __fastcall SetObjMapRange(int i, int x1, int y1, int x2, int y2, int v);
void __fastcall SetBookMsg(int i, int msg);

Loading…
Cancel
Save