zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SW: Fix conflicting types for: highlight, temppicnum, tempcstat, templotag, temphitag, tempextra, ExtAnalyzeSprites, ExtPreSaveMap 

git-svn-id: https://svn.eduke32.com/eduke32@5215 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-05-19 22:06:37 +00:00
parent 90de898fe5
commit 8b32035778
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
polymer/eduke32/source/sw/src/jnstub.c
View File

@ -150,11 +150,11 @@ extern short highlightsectorcnt;
// RIGHT SHIFT selection key
#define SPRITE_FLAG 16384
extern short highlight[MAXWALLS]; // sprite nums are + 16348
extern short highlight[MAXWALLS+MAXSPRITES]; // sprite nums are + 16348
extern short highlightcnt;
// Variables copied with the tab key
extern short temppicnum, tempcstat, templotag, temphitag, tempextra;
extern int32_t temppicnum, tempcstat, templotag, temphitag, tempextra;
void SectorMoveFloorZ(int);
void SectorMoveCeilingZ(int);
@ -458,11 +458,15 @@ DoAutoSize(spritetype *tspr)
short rotang = 0;
void
ExtAnalyzeSprites(void)
ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr)
{
int i, currsprite;
spritetype *tspr;
UNREFERENCED_PARAMETER(ourx);
UNREFERENCED_PARAMETER(oury);
UNREFERENCED_PARAMETER(oura);
UNREFERENCED_PARAMETER(smoothr);
rotang += 4;
if (rotang > 2047)
@ -3701,10 +3705,12 @@ void ExtPreLoadMap(void)
}
void ExtPreSaveMap(void)
int32_t ExtPreSaveMap(void)
{
ResetBuildFAF();
ResetSprites();
return 0;
}
void