mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-10 23:02:03 +00:00
SW: Fix warning: type does not match original declaration [enabled by default]
git-svn-id: https://svn.eduke32.com/eduke32@5226 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
41fcb1d32b
commit
221e58f8ad
5 changed files with 7 additions and 7 deletions
|
@ -163,7 +163,7 @@ void CopySectorMatch(short match)
|
||||||
if (TEST(sector[dest_sp->sectnum].extra, SECTFX_SECTOR_OBJECT))
|
if (TEST(sector[dest_sp->sectnum].extra, SECTFX_SECTOR_OBJECT))
|
||||||
{
|
{
|
||||||
SECTOR_OBJECTp sop;
|
SECTOR_OBJECTp sop;
|
||||||
extern short GlobSpeedSO;
|
extern int GlobSpeedSO;
|
||||||
|
|
||||||
// find and add sprite to SO
|
// find and add sprite to SO
|
||||||
sop = DetectSectorObject(§or[sprite[src_move].sectnum]);
|
sop = DetectSectorObject(§or[sprite[src_move].sectnum]);
|
||||||
|
|
|
@ -167,9 +167,9 @@ int DispFrameRate = FALSE;
|
||||||
int DispMono = TRUE;
|
int DispMono = TRUE;
|
||||||
int Fog = FALSE;
|
int Fog = FALSE;
|
||||||
int FogColor;
|
int FogColor;
|
||||||
int PreCaching = TRUE;
|
SWBOOL PreCaching = TRUE;
|
||||||
int GodMode = FALSE;
|
int GodMode = FALSE;
|
||||||
int BotMode = FALSE;
|
SWBOOL BotMode = FALSE;
|
||||||
short Skill = 2;
|
short Skill = 2;
|
||||||
short BetaVersion = 900;
|
short BetaVersion = 900;
|
||||||
short TotalKillable;
|
short TotalKillable;
|
||||||
|
|
|
@ -90,7 +90,7 @@ void LoadKVXFromScript(char *filename);
|
||||||
|
|
||||||
// voxelarray format is:
|
// voxelarray format is:
|
||||||
// spritenumber, voxelnumber
|
// spritenumber, voxelnumber
|
||||||
extern int aVoxelArray[MAXSPRITES];
|
extern int aVoxelArray[MAXTILES];
|
||||||
|
|
||||||
// Ken ALT highlighted array
|
// Ken ALT highlighted array
|
||||||
extern short highlightsector[MAXSECTORS];
|
extern short highlightsector[MAXSECTORS];
|
||||||
|
|
|
@ -89,7 +89,7 @@ unsigned int MoveThingsCount;
|
||||||
|
|
||||||
//int myminlag[MAX_SW_PLAYERS];
|
//int myminlag[MAX_SW_PLAYERS];
|
||||||
int mymaxlag, otherminlag, bufferjitter = 1;
|
int mymaxlag, otherminlag, bufferjitter = 1;
|
||||||
extern int8_t sync_first[MAXSYNCBYTES][60];
|
extern char sync_first[MAXSYNCBYTES][60];
|
||||||
extern int sync_found;
|
extern int sync_found;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -14295,14 +14295,14 @@ InitSumoSkull(short SpriteNum)
|
||||||
short max_missiles;
|
short max_missiles;
|
||||||
|
|
||||||
extern STATE s_SkullExplode[];
|
extern STATE s_SkullExplode[];
|
||||||
extern STATE s_SkullWait[];
|
extern STATE s_SkullWait[5][1];
|
||||||
extern STATEp sg_SkullWait[];
|
extern STATEp sg_SkullWait[];
|
||||||
extern ATTRIBUTE SkullAttrib;
|
extern ATTRIBUTE SkullAttrib;
|
||||||
|
|
||||||
|
|
||||||
PlaySound(DIGI_SERPSUMMONHEADS, &sp->x, &sp->y, &sp->z, v3df_none);
|
PlaySound(DIGI_SERPSUMMONHEADS, &sp->x, &sp->y, &sp->z, v3df_none);
|
||||||
|
|
||||||
new = SpawnSprite(STAT_ENEMY, SKULL_R0, &s_SkullWait[0], sp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->ang, 0);
|
new = SpawnSprite(STAT_ENEMY, SKULL_R0, &s_SkullWait[0][0], sp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->ang, 0);
|
||||||
|
|
||||||
np = &sprite[new];
|
np = &sprite[new];
|
||||||
nu = User[new];
|
nu = User[new];
|
||||||
|
|
Loading…
Reference in a new issue