teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-12-04 01:51:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- iterator variable cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-15 17:45:07 +02:00
parent 679c394b29
commit 727e2ceb29
28 changed files with 138 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/sw/src/ai.cpp
View file

@ -399,7 +399,7 @@ DoActorPickClosePlayer(short SpriteNum)
// if actor can still see the player // if actor can still see the player
int look_height = SPRITEp_TOS(sp); int look_height = SPRITEp_TOS(sp);
bool found = false; bool found = false;
int i,nexti; int i;
if (u->ID == ZOMBIE_RUN_R0 && gNet.MultiGameType == MULTI_GAME_COOPERATIVE) if (u->ID == ZOMBIE_RUN_R0 && gNet.MultiGameType == MULTI_GAME_COOPERATIVE)
goto TARGETACTOR; goto TARGETACTOR;

4
source/sw/src/break.cpp
View file

@ -543,7 +543,7 @@ BREAK_INFOp SetupSpriteForBreak(SPRITEp sp)
short FindBreakSpriteMatch(short match) short FindBreakSpriteMatch(short match)
{ {
short i,nexti; int i;
StatIterator it(STAT_BREAKABLE); StatIterator it(STAT_BREAKABLE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -1119,7 +1119,7 @@ void DoWallBreakMatch(short match)
static void DoWallBreakSpriteMatch(short match) static void DoWallBreakSpriteMatch(short match)
{ {
short i,nexti; int i;
StatIterator it(STAT_ENEMY); StatIterator it(STAT_ENEMY);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)

2
source/sw/src/bunny.cpp
View file

@ -925,7 +925,7 @@ DoPickCloseBunny(short SpriteNum)
USERp u = User[SpriteNum],tu; USERp u = User[SpriteNum],tu;
SPRITEp sp = &sprite[SpriteNum],tsp; SPRITEp sp = &sprite[SpriteNum],tsp;
int dist, near_dist = 1000, a,b,c; int dist, near_dist = 1000, a,b,c;
short i, nexti; int i;
//short BunnyCount=0, Bunny_Result = -1; //short BunnyCount=0, Bunny_Result = -1;
// if actor can still see the player // if actor can still see the player

2
source/sw/src/cache.cpp
View file

@ -293,7 +293,7 @@ PreCacheRange(short start_pic, short end_pic)
void PreCacheOverride(void) void PreCacheOverride(void)
{ {
int i,nexti; int i;
StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE); StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)

2
source/sw/src/coolie.cpp
View file

@ -473,7 +473,7 @@ void EnemyDefaults(short SpriteNum, ACTOR_ACTION_SETp action, PERSONALITYp perso
// make sure we start in the water if thats where we are // make sure we start in the water if thats where we are
if (u->lo_sectp) // && SectUser[u->lo_sectp - sector]) if (u->lo_sectp) // && SectUser[u->lo_sectp - sector])
{ {
short i,nexti; int i;
short sectnum = u->lo_sectp - sector; short sectnum = u->lo_sectp - sector;
if (SectUser[sectnum] && TEST(u->lo_sectp->extra, SECTFX_SINK)) if (SectUser[sectnum] && TEST(u->lo_sectp->extra, SECTFX_SINK))

11
source/sw/src/draw.cpp
View file

@ -1263,7 +1263,7 @@ void DrawCrosshair(PLAYERp pp)
void CameraView(PLAYERp pp, int *tx, int *ty, int *tz, short *tsectnum, binangle *tang, fixedhoriz *thoriz) void CameraView(PLAYERp pp, int *tx, int *ty, int *tz, short *tsectnum, binangle *tang, fixedhoriz *thoriz)
{ {
int i,nexti; int i;
binangle ang; binangle ang;
SPRITEp sp; SPRITEp sp;
bool found_camera = false; bool found_camera = false;
@ -1379,8 +1379,7 @@ void CameraView(PLAYERp pp, int *tx, int *ty, int *tz, short *tsectnum, binangle
void void
PreDraw(void) PreDraw(void)
{ {
short i, nexti; int i;
PreDrawStackedWater(); PreDrawStackedWater();
StatIterator it(STAT_FLOOR_SLOPE_DONT_DRAW); StatIterator it(STAT_FLOOR_SLOPE_DONT_DRAW);
@ -1393,8 +1392,7 @@ PreDraw(void)
void void
PostDraw(void) PostDraw(void)
{ {
short i, nexti; int i;
StatIterator it(STAT_FLOOR_SLOPE_DONT_DRAW); StatIterator it(STAT_FLOOR_SLOPE_DONT_DRAW);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
@ -1546,8 +1544,7 @@ void PreDrawStackedWater(void)
void FAF_DrawRooms(int x, int y, int z, fixed_t q16ang, fixed_t q16horiz, short sectnum) void FAF_DrawRooms(int x, int y, int z, fixed_t q16ang, fixed_t q16horiz, short sectnum)
{ {
short i,nexti; int i;
StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE); StatIterator it(STAT_CEILING_FLOOR_PIC_OVERRIDE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {

2
source/sw/src/game.cpp
View file

@ -479,7 +479,7 @@ void TerminateLevel(void)
videoFadePalette(0, 0, 0, 0); videoFadePalette(0, 0, 0, 0);
if (!currentLevel) return; if (!currentLevel) return;
int i, nexti, stat, pnum, ndx; int i, stat, pnum, ndx;
SECT_USERp* sectu; SECT_USERp* sectu;
// Free any track points // Free any track points

2
source/sw/src/hornet.cpp
View file

@ -552,7 +552,7 @@ DoHornetDeath(short SpriteNum)
// Hornets can swarm around other hornets or whatever is tagged as swarm target // Hornets can swarm around other hornets or whatever is tagged as swarm target
int DoCheckSwarm(short SpriteNum) int DoCheckSwarm(short SpriteNum)
{ {
short i,nexti; int i;
SPRITEp sp = &sprite[SpriteNum], tsp; SPRITEp sp = &sprite[SpriteNum], tsp;
USERp u = User[SpriteNum], tu; USERp u = User[SpriteNum], tu;
int dist, pdist, a,b,c; int dist, pdist, a,b,c;

2
source/sw/src/jsector.cpp
View file

@ -478,7 +478,7 @@ void drawroomstotile(int daposx, int daposy, int daposz,
void void
JS_ProcessEchoSpot() JS_ProcessEchoSpot()
{ {
short i,nexti; int i;
SPRITEp tp; SPRITEp tp;
int j,dist; int j,dist;
PLAYERp pp = Player+screenpeek; PLAYERp pp = Player+screenpeek;

6
source/sw/src/jweapon.cpp
View file

@ -1584,7 +1584,7 @@ InitChemBomb(short SpriteNum)
int int
PlayerInitFlashBomb(PLAYERp pp) PlayerInitFlashBomb(PLAYERp pp)
{ {
short i, nexti; int i;
unsigned int stat; unsigned int stat;
int dist, tx, ty, tmin; int dist, tx, ty, tmin;
short damage; short damage;
@ -1654,7 +1654,7 @@ PlayerInitFlashBomb(PLAYERp pp)
int int
InitFlashBomb(int16_t SpriteNum) InitFlashBomb(int16_t SpriteNum)
{ {
short i, nexti; int i;
unsigned int stat; unsigned int stat;
int dist, tx, ty, tmin; int dist, tx, ty, tmin;
short damage; short damage;
@ -2138,7 +2138,7 @@ DoFlagRangeTest(short Weapon, short range)
SPRITEp wp = &sprite[Weapon]; SPRITEp wp = &sprite[Weapon];
SPRITEp sp; SPRITEp sp;
short i, nexti; int i;
unsigned int stat; unsigned int stat;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;

10
source/sw/src/light.cpp
View file

@ -111,7 +111,7 @@ void SectorLightShade(SPRITEp sp, short intensity)
void DiffuseLighting(SPRITEp sp) void DiffuseLighting(SPRITEp sp)
{ {
short i, nexti; int i;
short count; short count;
short shade; short shade;
SPRITEp dsp; SPRITEp dsp;
@ -143,7 +143,7 @@ void DiffuseLighting(SPRITEp sp)
void DoLightingMatch(short match, short state) void DoLightingMatch(short match, short state)
{ {
short i,nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_LIGHTING); StatIterator it(STAT_LIGHTING);
@ -266,9 +266,8 @@ void DoLightingMatch(short match, short state)
void InitLighting(void) void InitLighting(void)
{ {
short i,nexti;
SPRITEp sp; SPRITEp sp;
int i;
// processed on level startup // processed on level startup
// puts lights in correct state // puts lights in correct state
@ -286,9 +285,8 @@ void InitLighting(void)
void DoLighting(void) void DoLighting(void)
{ {
short i,nexti;
SPRITEp sp; SPRITEp sp;
int i;
StatIterator it(STAT_LIGHTING); StatIterator it(STAT_LIGHTING);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)

2
source/sw/src/miscactr.cpp
View file

@ -819,7 +819,7 @@ int PachinkoCheckWin(short SpriteNum)
/*short rnd = */RANDOM_RANGE(1000); /*short rnd = */RANDOM_RANGE(1000);
if (RANDOM_RANGE(1000) > 900 || Pachinko_Win_Cheat) if (RANDOM_RANGE(1000) > 900 || Pachinko_Win_Cheat)
{ {
short i, nexti; int i;
SPRITEp tsp; SPRITEp tsp;
USERp tu; USERp tu;

23
source/sw/src/player.cpp
View file

@ -1145,7 +1145,8 @@ DoPickTarget(SPRITEp sp, uint32_t max_delta_ang, int skip_targets)
{ {
#define PICK_DIST 40000L #define PICK_DIST 40000L
short i, nexti, angle2, delta_ang; int i;
short angle2, delta_ang;
int dist, zh; int dist, zh;
SPRITEp ep; SPRITEp ep;
USERp eu; USERp eu;
@ -2401,7 +2402,7 @@ DoPlayerSectorUpdatePostMove(PLAYERp pp)
void PlaySOsound(short sectnum, short sound_num) void PlaySOsound(short sectnum, short sound_num)
{ {
short i,nexti; int i;
// play idle sound - sound 1 // play idle sound - sound 1
SectIterator it(StatDamageList[sectnum]); SectIterator it(StatDamageList[sectnum]);
@ -2417,7 +2418,7 @@ void PlaySOsound(short sectnum, short sound_num)
void StopSOsound(short sectnum) void StopSOsound(short sectnum)
{ {
short i,nexti; int i;
// play idle sound - sound 1 // play idle sound - sound 1
SectIterator it(StatDamageList[sectnum]); SectIterator it(StatDamageList[sectnum]);
@ -2517,7 +2518,7 @@ DoPlayerMoveBoat(PLAYERp pp)
void DoTankTreads(PLAYERp pp) void DoTankTreads(PLAYERp pp)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
int vel; int vel;
SECTORp *sectp; SECTORp *sectp;
int j; int j;
@ -2642,7 +2643,7 @@ DriveCrush(PLAYERp pp, int *x, int *y)
SECTOR_OBJECTp sop = pp->sop_control; SECTOR_OBJECTp sop = pp->sop_control;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
int i,nexti; int i;
short stat; short stat;
SECTORp *sectp; SECTORp *sectp;
@ -4297,7 +4298,7 @@ GetOverlapSector(int x, int y, short *over, short *under)
int int
GetOverlapSector2(int x, int y, short *over, short *under) GetOverlapSector2(int x, int y, short *over, short *under)
{ {
int i, nexti, found = 0; int i, found = 0;
short sf[2]= {0,0}; // sectors found short sf[2]= {0,0}; // sectors found
unsigned stat; unsigned stat;
@ -4389,7 +4390,7 @@ void
DoPlayerWarpToUnderwater(PLAYERp pp) DoPlayerWarpToUnderwater(PLAYERp pp)
{ {
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
short i, nexti; int i;
SECT_USERp sectu = SectUser[pp->cursectnum]; SECT_USERp sectu = SectUser[pp->cursectnum];
SPRITEp under_sp = NULL, over_sp = NULL; SPRITEp under_sp = NULL, over_sp = NULL;
bool Found = false; bool Found = false;
@ -4466,7 +4467,7 @@ void
DoPlayerWarpToSurface(PLAYERp pp) DoPlayerWarpToSurface(PLAYERp pp)
{ {
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
short i, nexti; int i;
SECT_USERp sectu = SectUser[pp->cursectnum]; SECT_USERp sectu = SectUser[pp->cursectnum];
short over, under; short over, under;
@ -5303,7 +5304,7 @@ void FindMainSector(SECTOR_OBJECTp sop)
void DoPlayerOperateMatch(PLAYERp pp, bool starting) void DoPlayerOperateMatch(PLAYERp pp, bool starting)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
if (!pp->sop) if (!pp->sop)
return; return;
@ -6352,7 +6353,7 @@ SPRITEp DoPlayerDeathCheckKick(PLAYERp pp)
{ {
SPRITEp sp = pp->SpriteP, hp; SPRITEp sp = pp->SpriteP, hp;
USERp u = User[pp->PlayerSprite], hu; USERp u = User[pp->PlayerSprite], hu;
short i,nexti; int i;
unsigned stat,dist; unsigned stat,dist;
int a,b,c; int a,b,c;
@ -6960,7 +6961,7 @@ MoveSkipSavePos(void)
{ {
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
short i,nexti; int i;
short pnum; short pnum;
PLAYERp pp; PLAYERp pp;

8
source/sw/src/quake.cpp
View file

@ -79,7 +79,7 @@ short CopyQuakeSpotToOn(SPRITEp sp)
void DoQuakeMatch(short match) void DoQuakeMatch(short match)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_QUAKE_SPOT); StatIterator it(STAT_QUAKE_SPOT);
@ -110,7 +110,7 @@ void DoQuakeMatch(short match)
void ProcessQuakeOn(void) void ProcessQuakeOn(void)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_QUAKE_ON); StatIterator it(STAT_QUAKE_ON);
@ -130,7 +130,7 @@ void ProcessQuakeOn(void)
void ProcessQuakeSpot(void) void ProcessQuakeSpot(void)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
int rand_test; int rand_test;
@ -178,7 +178,7 @@ void ProcessQuakeSpot(void)
void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *ang_diff) void QuakeViewChange(PLAYERp pp, int *z_diff, int *x_diff, int *y_diff, short *ang_diff)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
SPRITEp save_sp = NULL; SPRITEp save_sp = NULL;
int dist,save_dist = 999999; int dist,save_dist = 999999;

10
source/sw/src/rooms.cpp
View file

@ -349,7 +349,7 @@ FAFcansee(int32_t xs, int32_t ys, int32_t zs, int16_t sects,
int int
GetZadjustment(short sectnum, short hitag) GetZadjustment(short sectnum, short hitag)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
if (sectnum < 0 || !TEST(sector[sectnum].extra, SECTFX_Z_ADJUST)) if (sectnum < 0 || !TEST(sector[sectnum].extra, SECTFX_Z_ADJUST))
@ -651,7 +651,7 @@ PicInView(short tile_num, bool reset)
void void
SetupMirrorTiles(void) SetupMirrorTiles(void)
{ {
int i, nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_FAF); StatIterator it(STAT_FAF);
@ -802,7 +802,7 @@ FindCeilingView(short match, int32_t* x, int32_t* y, int32_t z, int16_t* sectnum
{ {
int xoff = 0; int xoff = 0;
int yoff = 0; int yoff = 0;
short i, nexti; int i;
SPRITEp sp = NULL; SPRITEp sp = NULL;
int pix_diff; int pix_diff;
int newz; int newz;
@ -892,7 +892,7 @@ FindFloorView(short match, int32_t* x, int32_t* y, int32_t z, int16_t* sectnum)
{ {
int xoff = 0; int xoff = 0;
int yoff = 0; int yoff = 0;
short i, nexti; int i;
SPRITEp sp = NULL; SPRITEp sp = NULL;
int newz; int newz;
int pix_diff; int pix_diff;
@ -983,7 +983,7 @@ FindFloorView(short match, int32_t* x, int32_t* y, int32_t z, int16_t* sectnum)
short short
ViewSectorInScene(short cursectnum, short level) ViewSectorInScene(short cursectnum, short level)
{ {
int i, nexti; int i;
SPRITEp sp; SPRITEp sp;
short match; short match;

8
source/sw/src/rotator.cpp
View file

@ -77,7 +77,7 @@ bool
RotatorSwitch(short match, short setting) RotatorSwitch(short match, short setting)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool found = false; bool found = false;
StatIterator it(STAT_DEFAULT); StatIterator it(STAT_DEFAULT);
@ -159,7 +159,7 @@ DoRotatorMatch(PLAYERp pp, short match, bool manual)
short sectnum; short sectnum;
short first_vator = -1; short first_vator = -1;
short i,nexti; int i;
//RotatorSwitch(match, ON); //RotatorSwitch(match, ON);
@ -238,7 +238,7 @@ TestRotatorMatchActive(short match)
USERp fu; USERp fu;
SPRITEp fsp; SPRITEp fsp;
short i,nexti; int i;
StatIterator it(STAT_ROTATOR); StatIterator it(STAT_ROTATOR);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -315,7 +315,7 @@ int DoRotatorMove(short SpriteNum)
ROTATORp r; ROTATORp r;
short ndx,w,startwall,endwall; short ndx,w,startwall,endwall;
SPRITEp pivot = NULL; SPRITEp pivot = NULL;
int i, nexti; int i;
vec2_t nxy; vec2_t nxy;
int dist,closest; int dist,closest;
bool kill = false; bool kill = false;

25
source/sw/src/sector.cpp
View file

@ -834,7 +834,7 @@ SectorDistanceByMid(short sect1, int sect2)
short short
DoSpawnActorTrigger(short match) DoSpawnActorTrigger(short match)
{ {
int i, nexti; int i;
short spawn_count = 0; short spawn_count = 0;
SPRITEp sp; SPRITEp sp;
@ -866,8 +866,7 @@ OperateSector(short sectnum, short player_is_operating)
if (!player_is_operating) if (!player_is_operating)
{ {
SPRITEp fsp; SPRITEp fsp;
short i,nexti; int i;
if (SectUser[sectnum] && SectUser[sectnum]->stag == SECT_LOCK_DOOR) if (SectUser[sectnum] && SectUser[sectnum]->stag == SECT_LOCK_DOOR)
return false; return false;
@ -1348,7 +1347,7 @@ DoSectorObjectKillMatch(short match)
bool bool
SearchExplodeSectorMatch(short match) SearchExplodeSectorMatch(short match)
{ {
short i,nexti; int i;
// THIS IS ONLY CALLED FROM DoMatchEverything // THIS IS ONLY CALLED FROM DoMatchEverything
StatIterator it(STAT_SPRITE_HIT_MATCH); StatIterator it(STAT_SPRITE_HIT_MATCH);
@ -1370,7 +1369,7 @@ SearchExplodeSectorMatch(short match)
void void
KillMatchingCrackSprites(short match) KillMatchingCrackSprites(short match)
{ {
short i,nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_SPRITE_HIT_MATCH); StatIterator it(STAT_SPRITE_HIT_MATCH);
@ -1391,7 +1390,7 @@ KillMatchingCrackSprites(short match)
void void
WeaponExplodeSectorInRange(short weapon) WeaponExplodeSectorInRange(short weapon)
{ {
short i, nexti; int i;
SPRITEp wp = &sprite[weapon]; SPRITEp wp = &sprite[weapon];
USERp wu = User[weapon]; USERp wu = User[weapon];
SPRITEp sp; SPRITEp sp;
@ -1472,7 +1471,7 @@ void DoDeleteSpriteMatch(short match)
}; };
int del_x = 0,del_y = 0; int del_x = 0,del_y = 0;
short i,nexti; int i;
unsigned stat; unsigned stat;
short found; short found;
@ -1632,7 +1631,7 @@ void DoMatchEverything(PLAYERp pp, short match, short state)
bool ComboSwitchTest(short combo_type, short match) bool ComboSwitchTest(short combo_type, short match)
{ {
short i,nexti; int i;
SPRITEp sp; SPRITEp sp;
int state; int state;
@ -1983,7 +1982,7 @@ OperateSprite(short SpriteNum, short player_is_operating)
int DoTrapReset(short match) int DoTrapReset(short match)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
@ -2013,7 +2012,7 @@ int DoTrapReset(short match)
int DoTrapMatch(short match) int DoTrapMatch(short match)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
@ -2145,7 +2144,7 @@ OperateTripTrigger(PLAYERp pp)
case TAG_TRIGGER_ACTORS: case TAG_TRIGGER_ACTORS:
{ {
int dist; int dist;
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
@ -2221,7 +2220,7 @@ OperateContinuousTrigger(PLAYERp pp)
#if 1 #if 1
DoTrapMatch(sector[pp->cursectnum].hitag); DoTrapMatch(sector[pp->cursectnum].hitag);
#else #else
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
@ -3190,7 +3189,7 @@ void
DoPanning(void) DoPanning(void)
{ {
int nx, ny; int nx, ny;
short i,nexti; int i;
SPRITEp sp; SPRITEp sp;
SECTORp sectp; SECTORp sectp;
WALLp wallp; WALLp wallp;

8
source/sw/src/slidor.cpp
View file

@ -72,7 +72,7 @@ bool
SlidorSwitch(short match, short setting) SlidorSwitch(short match, short setting)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool found = false; bool found = false;
StatIterator it(STAT_DEFAULT); StatIterator it(STAT_DEFAULT);
@ -155,7 +155,7 @@ DoSlidorMatch(PLAYERp pp, short match, bool manual)
short sectnum; short sectnum;
short first_vator = -1; short first_vator = -1;
short i,nexti; int i;
//SlidorSwitch(match, ON); //SlidorSwitch(match, ON);
@ -234,7 +234,7 @@ TestSlidorMatchActive(short match)
USERp fu; USERp fu;
SPRITEp fsp; SPRITEp fsp;
short i,nexti; int i;
StatIterator it(STAT_SLIDOR); StatIterator it(STAT_SLIDOR);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -623,7 +623,7 @@ int DoSlidorMove(short SpriteNum)
// if heading for the OFF (original) position and should NOT CRUSH // if heading for the OFF (original) position and should NOT CRUSH
if (TEST_BOOL3(sp) && r->tgt == 0) if (TEST_BOOL3(sp) && r->tgt == 0)
{ {
int i,nexti; int i;
SPRITEp bsp; SPRITEp bsp;
USERp bu; USERp bu;
bool found = false; bool found = false;

2
source/sw/src/sounds.cpp
View file

@ -280,7 +280,7 @@ void InitAmbient(int num, SPRITEp sp)
void StartAmbientSound(void) void StartAmbientSound(void)
{ {
int i, nexti; int i;
if (!SoundEnabled()) return; if (!SoundEnabled()) return;

12
source/sw/src/spike.cpp
View file

@ -76,7 +76,7 @@ bool
SpikeSwitch(short match, short setting) SpikeSwitch(short match, short setting)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool found = false; bool found = false;
StatIterator it(STAT_DEFAULT); StatIterator it(STAT_DEFAULT);
@ -146,7 +146,7 @@ short DoSpikeOperate(short sectnum)
{ {
SPRITEp fsp; SPRITEp fsp;
short match; short match;
short i,nexti; int i;
SectIterator it(sectnum); SectIterator it(sectnum);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -183,7 +183,7 @@ DoSpikeMatch(short match)
SPRITEp fsp; SPRITEp fsp;
short first_spike = -1; short first_spike = -1;
short i,nexti; int i;
//SpikeSwitch(match, ON); //SpikeSwitch(match, ON);
@ -219,7 +219,7 @@ TestSpikeMatchActive(short match)
USERp fu; USERp fu;
SPRITEp fsp; SPRITEp fsp;
short i,nexti; int i;
StatIterator it(STAT_SPIKE); StatIterator it(STAT_SPIKE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -304,7 +304,7 @@ void SpikeAlign(short SpriteNum)
void MoveSpritesWithSpike(short sectnum) void MoveSpritesWithSpike(short sectnum)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
int cz,fz; int cz,fz;
SectIterator it(sectnum); SectIterator it(sectnum);
@ -399,7 +399,7 @@ int DoSpike(short SpriteNum)
// if heading for the OFF (original) position and should NOT CRUSH // if heading for the OFF (original) position and should NOT CRUSH
if (TEST_BOOL3(sp) && u->z_tgt == u->oz) if (TEST_BOOL3(sp) && u->z_tgt == u->oz)
{ {
int i,nexti; int i;
SPRITEp bsp; SPRITEp bsp;
USERp bu; USERp bu;
bool found = false; bool found = false;

42
source/sw/src/sprite.cpp
View file

@ -622,7 +622,7 @@ KillSprite(int16_t SpriteNum)
{ {
SPRITEp sp = &sprite[SpriteNum]; SPRITEp sp = &sprite[SpriteNum];
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
short i,nexti; int i;
unsigned stat; unsigned stat;
short statnum,sectnum; short statnum,sectnum;
//extern short Zombies; //extern short Zombies;
@ -1759,7 +1759,7 @@ SpriteSetupPost(void)
SPRITEp ds; SPRITEp ds;
USERp u; USERp u;
short SpriteNum, NextSprite; short SpriteNum, NextSprite;
short i, nexti; int i;
int cz,fz; int cz,fz;
// Post processing of some sprites after gone through the main SpriteSetup() // Post processing of some sprites after gone through the main SpriteSetup()
@ -2882,7 +2882,7 @@ SpriteSetup(void)
case VIEW_THRU_CEILING: case VIEW_THRU_CEILING:
case VIEW_THRU_FLOOR: case VIEW_THRU_FLOOR:
{ {
int i,nexti; int i;
// make sure there is only one set per level of these // make sure there is only one set per level of these
StatIterator it(STAT_FAF); StatIterator it(STAT_FAF);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -3819,7 +3819,7 @@ NUKE_REPLACEMENT:
bool ItemSpotClear(SPRITEp sip, short statnum, short id) bool ItemSpotClear(SPRITEp sip, short statnum, short id)
{ {
bool found = false; bool found = false;
short i,nexti; int i;
if (TEST_BOOL2(sip)) if (TEST_BOOL2(sip))
{ {
@ -6693,7 +6693,7 @@ StateControl(int16_t SpriteNum)
void void
SpriteControl(void) SpriteControl(void)
{ {
int32_t i, nexti, stat; int32_t i, stat;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
short pnum, CloseToPlayer; short pnum, CloseToPlayer;
@ -6709,11 +6709,11 @@ SpriteControl(void)
u = User[i]; u = User[i];
sp = User[i]->SpriteP; sp = User[i]->SpriteP;
STATE_CONTROL(i, sp, u, StateTics) STATE_CONTROL(i, sp, u, StateTics)
// ASSERT(nexti >= 0 ? User[nexti] != NULL : true); // ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#else #else
ASSERT(User[i]); ASSERT(User[i]);
StateControl(i); StateControl(i);
// ASSERT(nexti >= 0 ? User[nexti] != NULL : true); // ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#endif #endif
} }
@ -6730,11 +6730,11 @@ SpriteControl(void)
u = User[i]; u = User[i];
sp = User[i]->SpriteP; sp = User[i]->SpriteP;
STATE_CONTROL(i, sp, u, StateTics) STATE_CONTROL(i, sp, u, StateTics)
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#else #else
ASSERT(User[i]); ASSERT(User[i]);
StateControl(i); StateControl(i);
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#endif #endif
} }
} }
@ -6780,12 +6780,12 @@ SpriteControl(void)
u = User[i]; u = User[i];
sp = User[i]->SpriteP; sp = User[i]->SpriteP;
STATE_CONTROL(i, sp, u, StateTics) STATE_CONTROL(i, sp, u, StateTics)
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#else #else
StateControl(i); StateControl(i);
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#endif #endif
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
} }
else else
{ {
@ -6808,22 +6808,22 @@ SpriteControl(void)
u = User[i]; u = User[i];
sp = User[i]->SpriteP; sp = User[i]->SpriteP;
STATE_CONTROL(i, sp, u, StateTics) STATE_CONTROL(i, sp, u, StateTics)
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#else #else
ASSERT(User[i]); ASSERT(User[i]);
StateControl(i); StateControl(i);
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#endif #endif
} }
} }
} }
StatIterator it(STAT_NO_STATE); it.Reset(STAT_NO_STATE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
if (User[i] && User[i]->ActorActionFunc) if (User[i] && User[i]->ActorActionFunc)
(*User[i]->ActorActionFunc)(i); (*User[i]->ActorActionFunc)(i);
ASSERT(nexti >= 0 ? sprite[nexti].statnum != MAXSTATUS : true); ASSERT(it.PeekIndex() >= 0 ? sprite[it.PeekIndex()].statnum != MAXSTATUS : true);
} }
if (MoveSkip8 == 0) if (MoveSkip8 == 0)
@ -6842,17 +6842,11 @@ SpriteControl(void)
it.Reset(STAT_WALLBLOOD_QUEUE); it.Reset(STAT_WALLBLOOD_QUEUE);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
#if INLINE_STATE
ASSERT(User[i]); ASSERT(User[i]);
u = User[i]; u = User[i];
sp = User[i]->SpriteP; sp = User[i]->SpriteP;
STATE_CONTROL(i, sp, u, StateTics) STATE_CONTROL(i, sp, u, StateTics)
ASSERT(nexti >= 0 ? User[nexti] != NULL : true); ASSERT(it.PeekIndex() >= 0 ? User[it.PeekIndex()] != NULL : true);
#else
ASSERT(User[i]);
StateControl(i);
ASSERT(nexti >= 0 ? User[nexti] != NULL : true);
#endif
} }
} }
@ -6896,7 +6890,7 @@ SpriteControl(void)
if (!TEST(u->Flags, SPR_ACTIVE)) if (!TEST(u->Flags, SPR_ACTIVE))
continue; continue;
if (i == 69 && nexti == -1) if (i == 69 && it.PeekIndex() == -1)
continue; continue;
(*User[i]->ActorActionFunc)(i); (*User[i]->ActorActionFunc)(i);

3
source/sw/src/sumo.cpp
View file

@ -814,7 +814,8 @@ BossHealthMeter(void)
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
PLAYERp pp = Player + myconnectindex; PLAYERp pp = Player + myconnectindex;
short color=0,i=0,nexti,metertics,meterunit; short color=0,metertics,meterunit;
int i = 0;
int y; int y;
extern bool NoMeters; extern bool NoMeters;
short health; short health;

10
source/sw/src/track.cpp
View file

@ -637,13 +637,13 @@ TrackSetup(void)
// didn't find the start point of the track // didn't find the start point of the track
if (t->NumPoints == 0) if (t->NumPoints == 0)
{ {
int i, nexti; int i;
auto const sp = (uspritetype const *)&sprite[headspritestat[STAT_TRACK+ndx]]; auto const sp = (uspritetype const *)&sprite[headspritestat[STAT_TRACK+ndx]];
Printf("WARNING: Did not find first point of Track Number %d, x %d, y %d\n", ndx, sp->x, sp->y); Printf("WARNING: Did not find first point of Track Number %d, x %d, y %d\n", ndx, sp->x, sp->y);
for (i=headspritestat[STAT_TRACK+ndx]; i>=0; i=nexti) StatIterator it(STAT_TRACK + ndx);
while ((i = it.NextIndex()) >= 0)
{ {
// neuter the track's sprite list // neuter the track's sprite list
nexti = nextspritestat[i];
deletesprite(i); deletesprite(i);
} }
continue; continue;
@ -1544,7 +1544,7 @@ PlaceSectorObjectsOnTracks(void)
void void
PlaceActorsOnTracks(void) PlaceActorsOnTracks(void)
{ {
short i, nexti, j, tag; short i, j, tag;
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
TRACK_POINTp tpoint = NULL; TRACK_POINTp tpoint = NULL;
@ -2238,7 +2238,7 @@ void CallbackSOsink(ANIMp ap, void *data)
short startwall, endwall, j; short startwall, endwall, j;
short dest_sector = -1; short dest_sector = -1;
short src_sector = -1; short src_sector = -1;
short i, nexti, ndx; short i, ndx;
char found = false; char found = false;
int tgt_depth; int tgt_depth;

16
source/sw/src/vator.cpp
View file

@ -81,7 +81,7 @@ bool
VatorSwitch(short match, short setting) VatorSwitch(short match, short setting)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool found = false; bool found = false;
StatIterator it(STAT_DEFAULT); StatIterator it(STAT_DEFAULT);
@ -151,7 +151,7 @@ short DoVatorOperate(PLAYERp pp, short sectnum)
{ {
SPRITEp fsp; SPRITEp fsp;
short match; short match;
short i,nexti; int i;
SectIterator it(sectnum); SectIterator it(sectnum);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -222,7 +222,7 @@ DoVatorMatch(PLAYERp pp, short match)
short sectnum; short sectnum;
short first_vator = -1; short first_vator = -1;
short i,nexti; int i;
//VatorSwitch(match, ON); //VatorSwitch(match, ON);
@ -296,7 +296,7 @@ TestVatorMatchActive(short match)
USERp fu; USERp fu;
SPRITEp fsp; SPRITEp fsp;
short i,nexti; int i;
StatIterator it(STAT_VATOR); StatIterator it(STAT_VATOR);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -322,7 +322,7 @@ TestVatorMatchActive(short match)
void InterpSectorSprites(short sectnum, bool state) void InterpSectorSprites(short sectnum, bool state)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
SectIterator it(sectnum); SectIterator it(sectnum);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
@ -348,7 +348,7 @@ void InterpSectorSprites(short sectnum, bool state)
void MoveSpritesWithSector(short sectnum, int z_amt, bool type) void MoveSpritesWithSector(short sectnum, int z_amt, bool type)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool both = false; bool both = false;
if (SectUser[sectnum]) if (SectUser[sectnum])
@ -541,7 +541,7 @@ int DoVator(short SpriteNum)
// if heading for the OFF (original) position and should NOT CRUSH // if heading for the OFF (original) position and should NOT CRUSH
if (TEST_BOOL3(sp) && u->z_tgt == u->oz) if (TEST_BOOL3(sp) && u->z_tgt == u->oz)
{ {
int i,nexti; int i;
SPRITEp bsp; SPRITEp bsp;
USERp bu; USERp bu;
bool found = false; bool found = false;
@ -595,7 +595,7 @@ int DoVator(short SpriteNum)
} }
else else
{ {
int i,nexti; int i;
SPRITEp bsp; SPRITEp bsp;
SectIterator it(sp->sectnum); SectIterator it(sp->sectnum);

6
source/sw/src/vis.cpp
View file

@ -45,7 +45,7 @@ extern short NormalVisibility; // player.c
void ProcessVisOn(void) void ProcessVisOn(void)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
StatIterator it(STAT_VIS_ON); StatIterator it(STAT_VIS_ON);
@ -86,7 +86,7 @@ void ProcessVisOn(void)
void VisViewChange(PLAYERp pp, int *vis) void VisViewChange(PLAYERp pp, int *vis)
{ {
short i, nexti; int i;
SPRITEp sp; SPRITEp sp;
short BrightestVis = NormalVisibility; short BrightestVis = NormalVisibility;
int x,y,z; int x,y,z;
@ -131,7 +131,7 @@ int SpawnVis(short Parent, short sectnum, int x, int y, int z, int amt)
{ {
short SpriteNum; short SpriteNum;
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
if (Parent >= 0) if (Parent >= 0)
{ {

4
source/sw/src/wallmove.cpp
View file

@ -164,7 +164,7 @@ int DoWallMove(SPRITEp sp)
bool CanSeeWallMove(SPRITEp wp, short match) bool CanSeeWallMove(SPRITEp wp, short match)
{ {
short i,nexti; int i;
bool found = false; bool found = false;
SPRITEp sp; SPRITEp sp;
@ -193,7 +193,7 @@ bool CanSeeWallMove(SPRITEp wp, short match)
int DoWallMoveMatch(short match) int DoWallMoveMatch(short match)
{ {
SPRITEp sp; SPRITEp sp;
short i,nexti; int i;
bool found = false; bool found = false;
// just all with the same matching tags // just all with the same matching tags

6
source/sw/src/warp.cpp
View file

@ -43,7 +43,7 @@ extern bool Prediction;
bool bool
WarpPlaneSectorInfo(short sectnum, SPRITEp *sp_ceiling, SPRITEp *sp_floor) WarpPlaneSectorInfo(short sectnum, SPRITEp *sp_ceiling, SPRITEp *sp_floor)
{ {
int i,nexti; int i;
SPRITEp sp; SPRITEp sp;
*sp_floor = NULL; *sp_floor = NULL;
@ -116,7 +116,7 @@ WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum
int xoff; int xoff;
int yoff; int yoff;
int zoff; int zoff;
short i, nexti; int i;
SPRITEp sp = sp_from; SPRITEp sp = sp_from;
short match; short match;
short to_tag = 0; short to_tag = 0;
@ -215,7 +215,7 @@ WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum
bool bool
WarpSectorInfo(short sectnum, SPRITEp *sp_warp) WarpSectorInfo(short sectnum, SPRITEp *sp_warp)
{ {
int i,nexti; int i;
SPRITEp sp; SPRITEp sp;
*sp_warp = NULL; *sp_warp = NULL;

56
source/sw/src/weapon.cpp
View file

@ -2760,7 +2760,7 @@ int DoLavaErupt(short SpriteNum)
{ {
SPRITEp sp = &sprite[SpriteNum]; SPRITEp sp = &sprite[SpriteNum];
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
short i,nexti,pnum; short i,pnum;
PLAYERp pp; PLAYERp pp;
SPRITEp tsp; SPRITEp tsp;
bool found = false; bool found = false;
@ -7523,7 +7523,7 @@ DoDamageTest(short Weapon)
USERp u; USERp u;
SPRITEp sp; SPRITEp sp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;
@ -7595,7 +7595,7 @@ DoFlamesDamageTest(short Weapon)
USERp u; USERp u;
SPRITEp sp; SPRITEp sp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;
@ -7769,7 +7769,7 @@ int DoExpDamageTest(short Weapon)
USERp u; USERp u;
SPRITEp sp; SPRITEp sp;
short i, nexti, stat; short i, stat;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;
int max_stat; int max_stat;
@ -7922,7 +7922,7 @@ int DoMineExpMine(short Weapon)
USERp u; USERp u;
SPRITEp sp; SPRITEp sp;
short i, nexti; int i;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;
int zdist; int zdist;
@ -9341,7 +9341,7 @@ DoMineRangeTest(short Weapon, short range)
USERp u; USERp u;
SPRITEp sp; SPRITEp sp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, tx, ty; int dist, tx, ty;
int tmin; int tmin;
@ -12278,7 +12278,7 @@ DoBloodWorm(int16_t Weapon)
{ {
SPRITEp tsp; SPRITEp tsp;
USERp tu; USERp tu;
int i,nexti; int i;
InitBloodSpray(Weapon, false, 1); InitBloodSpray(Weapon, false, 1);
InitBloodSpray(Weapon, false, 1); InitBloodSpray(Weapon, false, 1);
@ -12393,7 +12393,7 @@ DoBloodWorm(int16_t Weapon)
{ {
SPRITEp tsp; SPRITEp tsp;
USERp tu; USERp tu;
int i,nexti; int i;
InitBloodSpray(Weapon, false, 1); InitBloodSpray(Weapon, false, 1);
InitBloodSpray(Weapon, false, 1); InitBloodSpray(Weapon, false, 1);
@ -13683,7 +13683,7 @@ InitSwordAttack(PLAYERp pp)
{ {
USERp u = User[pp->PlayerSprite],tu; USERp u = User[pp->PlayerSprite],tu;
SPRITEp sp = NULL; SPRITEp sp = NULL;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist; int dist;
short reach,face; short reach,face;
@ -13862,7 +13862,7 @@ InitFistAttack(PLAYERp pp)
{ {
USERp u = User[pp->PlayerSprite],tu; USERp u = User[pp->PlayerSprite],tu;
SPRITEp sp = NULL; SPRITEp sp = NULL;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist; int dist;
short reach,face; short reach,face;
@ -14213,7 +14213,7 @@ InitSumoStompAttack(short SpriteNum)
{ {
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = &sprite[SpriteNum],tsp; SPRITEp sp = &sprite[SpriteNum],tsp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist; int dist;
short reach; short reach;
@ -15987,7 +15987,7 @@ InitRipperSlash(short SpriteNum)
USERp u = User[SpriteNum], hu; USERp u = User[SpriteNum], hu;
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16025,7 +16025,7 @@ InitBunnySlash(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16059,7 +16059,7 @@ InitSerpSlash(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16129,7 +16129,7 @@ DoBladeDamage(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16173,7 +16173,7 @@ DoStaticFlamesDamage(short SpriteNum)
USERp u = User[SpriteNum]; USERp u = User[SpriteNum];
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16218,7 +16218,7 @@ InitCoolgBash(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16256,7 +16256,7 @@ InitSkelSlash(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -16290,7 +16290,7 @@ InitGoroChop(short SpriteNum)
{ {
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -17195,7 +17195,7 @@ InitEelFire(short SpriteNum)
USERp u = User[SpriteNum], hu; USERp u = User[SpriteNum], hu;
SPRITEp sp = User[SpriteNum]->SpriteP; SPRITEp sp = User[SpriteNum]->SpriteP;
SPRITEp hp; SPRITEp hp;
short i, nexti; int i;
unsigned stat; unsigned stat;
int dist, a, b, c; int dist, a, b, c;
@ -19770,7 +19770,7 @@ InitEnemyFireball(short SpriteNum)
bool bool
WarpToUnderwater(short *sectnum, int *x, int *y, int *z) WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
{ {
short i, nexti; int i;
SECT_USERp sectu = SectUser[*sectnum]; SECT_USERp sectu = SectUser[*sectnum];
SPRITEp under_sp = NULL, over_sp = NULL; SPRITEp under_sp = NULL, over_sp = NULL;
bool Found = false; bool Found = false;
@ -19800,7 +19800,7 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
Found = false; Found = false;
// search for UNDERWATER "under" sprite for reference point // search for UNDERWATER "under" sprite for reference point
StatIterator it(STAT_UNDERWATER); it.Reset(STAT_UNDERWATER);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
under_sp = &sprite[i]; under_sp = &sprite[i];
@ -19844,7 +19844,7 @@ WarpToUnderwater(short *sectnum, int *x, int *y, int *z)
bool bool
WarpToSurface(short *sectnum, int *x, int *y, int *z) WarpToSurface(short *sectnum, int *x, int *y, int *z)
{ {
short i, nexti; int i;
SECT_USERp sectu = SectUser[*sectnum]; SECT_USERp sectu = SectUser[*sectnum];
short over, under; short over, under;
int sx, sy; int sx, sy;
@ -19875,7 +19875,7 @@ WarpToSurface(short *sectnum, int *x, int *y, int *z)
Found = false; Found = false;
// search for DIVE_AREA "over" sprite for reference point // search for DIVE_AREA "over" sprite for reference point
StatIterator it(STAT_DIVE_AREA); it.Reset(STAT_DIVE_AREA);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
over_sp = &sprite[i]; over_sp = &sprite[i];
@ -19919,7 +19919,7 @@ bool
SpriteWarpToUnderwater(SPRITEp sp) SpriteWarpToUnderwater(SPRITEp sp)
{ {
USERp u = User[sp - sprite]; USERp u = User[sp - sprite];
short i, nexti; int i;
SECT_USERp sectu = SectUser[sp->sectnum]; SECT_USERp sectu = SectUser[sp->sectnum];
SPRITEp under_sp = NULL, over_sp = NULL; SPRITEp under_sp = NULL, over_sp = NULL;
bool Found = false; bool Found = false;
@ -19949,7 +19949,7 @@ SpriteWarpToUnderwater(SPRITEp sp)
Found = false; Found = false;
// search for UNDERWATER "under" sprite for reference point // search for UNDERWATER "under" sprite for reference point
StatIterator it(STAT_UNDERWATER); it.Reset(STAT_UNDERWATER);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
under_sp = &sprite[i]; under_sp = &sprite[i];
@ -19999,7 +19999,7 @@ bool
SpriteWarpToSurface(SPRITEp sp) SpriteWarpToSurface(SPRITEp sp)
{ {
USERp u = User[sp - sprite]; USERp u = User[sp - sprite];
short i, nexti; int i;
SECT_USERp sectu = SectUser[sp->sectnum]; SECT_USERp sectu = SectUser[sp->sectnum];
short over, under; short over, under;
int sx, sy; int sx, sy;
@ -20034,7 +20034,7 @@ SpriteWarpToSurface(SPRITEp sp)
Found = false; Found = false;
// search for DIVE_AREA "over" sprite for reference point // search for DIVE_AREA "over" sprite for reference point
StatIterator it(STAT_DIVE_AREA); it.Reset(STAT_DIVE_AREA);
while ((i = it.NextIndex()) >= 0) while ((i = it.NextIndex()) >= 0)
{ {
over_sp = &sprite[i]; over_sp = &sprite[i];