zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Rename SendMessage() to SW_SendMessage() and DELETE() to REMOVE() to avoid conflicts with Windows headers.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5200 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-19 21:59:39 +00:00
parent af0e6df762
commit 56bdcdae7e
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/sw/src/game.c
View file

@ -4538,7 +4538,7 @@ FunctionKeys(PLAYERp pp)
if (pnum != myconnectindex) if (pnum != myconnectindex)
{ {
sprintf(ds,"%s: %s",pp->PlayerName, WangBangMacro[fn_key-1]); sprintf(ds,"%s: %s",pp->PlayerName, WangBangMacro[fn_key-1]);
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
} }
} }
} }
@ -4838,9 +4838,9 @@ SEND_MESSAGE:
if (pnum != myconnectindex) if (pnum != myconnectindex)
{ {
if (TeamSendAll) if (TeamSendAll)
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
else if (User[pp->PlayerSprite]->spal == User[Player[pnum].PlayerSprite]->spal) else if (User[pp->PlayerSprite]->spal == User[Player[pnum].PlayerSprite]->spal)
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
} }
} }
} }
@ -4849,7 +4849,7 @@ SEND_MESSAGE:
{ {
if (pnum != myconnectindex) if (pnum != myconnectindex)
{ {
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
} }
} }
adduserquote(MessageInputString); adduserquote(MessageInputString);

2
polymer/eduke32/source/sw/src/jsector.c
View file

@ -1167,7 +1167,7 @@ KillOrgTile(OrgTileP tp)
ASSERT(tp); ASSERT(tp);
ASSERT(ValidPtr(tp)); ASSERT(ValidPtr(tp));
DELETE(tp); REMOVE(tp);
FreeMem(tp); FreeMem(tp);
} }

2
polymer/eduke32/source/sw/src/lists.h
View file

@ -54,7 +54,7 @@ typedef
((LIST) list)->Prev = (LIST) nodep, \ ((LIST) list)->Prev = (LIST) nodep, \
((LIST) nodep)->Prev->Next = (LIST) nodep) ((LIST) nodep)->Prev->Next = (LIST) nodep)
#define DELETE(nodep) ( ((LIST) nodep)->Prev->Next = ((LIST) nodep)->Next, \ #define REMOVE(nodep) ( ((LIST) nodep)->Prev->Next = ((LIST) nodep)->Next, \
((LIST) nodep)->Next->Prev = ((LIST) nodep)->Prev) ((LIST) nodep)->Next->Prev = ((LIST) nodep)->Prev)

16
polymer/eduke32/source/sw/src/net.c
View file

@ -434,7 +434,7 @@ ResumeAction(void)
} }
void void
SendMessage(short pnum, char *text) SW_SendMessage(short pnum, char *text)
{ {
if (!CommEnabled) if (!CommEnabled)
return; return;
@ -561,12 +561,12 @@ CheckVersion(int GameVersion)
if (!Player[pnum].PlayerVersion) if (!Player[pnum].PlayerVersion)
{ {
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
SendMessage(pnum, VERSION_MSG); SW_SendMessage(pnum, VERSION_MSG);
} }
} }
} }
@ -795,7 +795,7 @@ SWBOOL MenuCommPlayerQuit(short quit_player)
if (pnum != quit_player) if (pnum != quit_player)
{ {
sprintf(ds,"%s has quit the game.",Player[myconnectindex].PlayerName); sprintf(ds,"%s has quit the game.",Player[myconnectindex].PlayerName);
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
} }
} }

2
polymer/eduke32/source/sw/src/net.h
View file

@ -200,7 +200,7 @@ SWBOOL MenuCommPlayerQuit(short quit_player);
void SendVersion(int version); void SendVersion(int version);
void InitNetPlayerOptions(void); void InitNetPlayerOptions(void);
void CheckVersion(int GameVersion); void CheckVersion(int GameVersion);
void SendMessage(short pnum,char *text); void SW_SendMessage(short pnum,char *text);
void PauseGame(void); void PauseGame(void);
void ResumeGame(void); void ResumeGame(void);

6
polymer/eduke32/source/sw/src/panel.c
View file

@ -1123,7 +1123,7 @@ SwordBlur(PANEL_SPRITEp psp)
psp->shade += 10; psp->shade += 10;
// change sprites priority // change sprites priority
DELETE(psp); REMOVE(psp);
psp->priority--; psp->priority--;
InsertPanelSprite(psp->PlayerP, psp); InsertPanelSprite(psp->PlayerP, psp);
} }
@ -6361,7 +6361,7 @@ FistBlur(PANEL_SPRITEp psp)
psp->shade += 10; psp->shade += 10;
// change sprites priority // change sprites priority
DELETE(psp); REMOVE(psp);
psp->priority--; psp->priority--;
InsertPanelSprite(psp->PlayerP, psp); InsertPanelSprite(psp->PlayerP, psp);
} }
@ -7252,7 +7252,7 @@ pKillSprite(PANEL_SPRITEp psp)
PRODUCTION_ASSERT(psp); PRODUCTION_ASSERT(psp);
ASSERT(ValidPtr(psp)); ASSERT(ValidPtr(psp));
DELETE(psp); REMOVE(psp);
FreeMem(psp); FreeMem(psp);
} }

2
polymer/eduke32/source/sw/src/player.c
View file

@ -6491,7 +6491,7 @@ DoPlayerDeathMessage(PLAYERp pp, PLAYERp killer)
if (pnum == myconnectindex) if (pnum == myconnectindex)
adduserquote(ds); adduserquote(ds);
else else
SendMessage(pnum, ds); SW_SendMessage(pnum, ds);
} }
} }