zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-02 06:52:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- deleted a large number of unused GetSpriteIndex calls.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-14 00:07:55 +01:00
parent 89e687f166
commit 068f887892
21 changed files with 2 additions and 95 deletions

8
source/games/whaven/src/aidemon.cpp
View file

@ -5,7 +5,6 @@ BEGIN_WH_NS
static void chasedemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
if (spr.lotag < 0)
@ -77,16 +76,12 @@ static void chasedemon(PLAYER& plr, DWHActor* actor)
static void searchdemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
aisearch(plr, actor, true);
checksector6(actor);
}
static void paindemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -102,7 +97,6 @@ static void paindemon(PLAYER& plr, DWHActor* actor)
static void facedemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7), spr.sectnum);
@ -133,7 +127,6 @@ static void facedemon(PLAYER& plr, DWHActor* actor)
static void attackdemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
if (plr.z < spr.z) {
@ -157,7 +150,6 @@ static void attackdemon(PLAYER& plr, DWHActor* actor)
static void fleedemon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;

3
source/games/whaven/src/aidevil.cpp
View file

@ -102,7 +102,6 @@ static void paindevil(PLAYER& plr, DWHActor* actor)
static void facedevil(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -212,8 +211,6 @@ static void resurectdevil(PLAYER& plr, DWHActor* actor)
static void searchdevil(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}

5
source/games/whaven/src/aidragon.cpp
View file

@ -10,7 +10,6 @@ static void firebreath(PLAYER& plr, int i, int a, int b, int c);
static void chasedragon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -230,8 +229,6 @@ static void resurectdragon(PLAYER& plr, DWHActor* actor)
static void searchdragon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, true);
checksector6(actor);
}
@ -250,7 +247,6 @@ static void frozendragon(PLAYER& plr, DWHActor* actor)
static void nukeddragon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -277,7 +273,6 @@ static void paindragon(PLAYER& plr, DWHActor* actor)
static void facedragon(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

5
source/games/whaven/src/aifatwitch.cpp
View file

@ -78,15 +78,12 @@ static void resurectfatwitch(PLAYER& plr, DWHActor* actor)
static void searchfatwitch(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}
static void nukedfatwitch(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -119,7 +116,6 @@ static void painfatwitch(PLAYER& plr, DWHActor* actor)
static void facefatwitch(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7), spr.sectnum);
@ -213,7 +209,6 @@ static void fleefatwitch(PLAYER& plr, DWHActor* actor)
static void castfatwitch(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;

3
source/games/whaven/src/aifish.cpp
View file

@ -81,7 +81,6 @@ static void chasefish(PLAYER& plr, DWHActor* actor)
static void diefish(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
DeleteActor(actor);
}
@ -149,8 +148,6 @@ static void skirmishfish(PLAYER& plr, DWHActor* actor)
static void searchfish(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}

3
source/games/whaven/src/aifred.cpp
View file

@ -133,8 +133,6 @@ static void diefred(PLAYER& plr, DWHActor* actor)
static void searchfred(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplfred(plr, actor);
@ -154,7 +152,6 @@ static void frozenfred(PLAYER& plr, DWHActor* actor)
static void facefred(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

5
source/games/whaven/src/aigoblin.cpp
View file

@ -131,7 +131,6 @@ static void paingoblin(PLAYER& plr, DWHActor* actor)
static void facegoblin(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -202,7 +201,6 @@ static void fleegoblin(PLAYER& plr, DWHActor* actor)
static void standgoblin(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.ang = getangle(plr.x - spr.x, plr.y - spr.y);
@ -288,8 +286,6 @@ static void resurectgoblin(PLAYER& plr, DWHActor* actor)
static void searchgoblin(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplgoblin(plr, actor);
@ -309,7 +305,6 @@ static void frozengoblin(PLAYER& plr, DWHActor* actor)
static void nukedgoblin(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;

7
source/games/whaven/src/aigonzo.cpp
View file

@ -251,9 +251,6 @@ static void skirmishgonzo(PLAYER& plr, DWHActor* actor)
static void searchgonzo(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
if (!checksector6(actor))
checkexplgonzo(plr, actor);
}
@ -270,7 +267,6 @@ static void nukedgonzo(PLAYER& plr, DWHActor* actor)
static void frozengonzo(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -328,7 +324,6 @@ static void paingonzo(PLAYER& plr, DWHActor* actor)
static void facegonzo(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -508,7 +503,6 @@ static void castgonzo(PLAYER& plr, DWHActor* actor)
static void diegonzo(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -540,7 +534,6 @@ void gonzoProcess(PLAYER& plr)
while (auto actor = it.Next())
{
SPRITE& spr = actor->s();
int i = actor->GetSpriteIndex();
spr.lotag -= TICSPERFRAME;
if (spr.lotag < 0) {

4
source/games/whaven/src/aigron.cpp
View file

@ -123,7 +123,6 @@ static void chasegron(PLAYER& plr, DWHActor* actor)
static void resurectgron(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -181,8 +180,6 @@ static void skirmishgron(PLAYER& plr, DWHActor* actor)
static void searchgron(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplgron(plr, actor);
@ -255,7 +252,6 @@ static void paingron(PLAYER& plr, DWHActor* actor)
static void facegron(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

11
source/games/whaven/src/aiguardian.cpp
View file

@ -5,7 +5,6 @@ BEGIN_WH_NS
static void chaseguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -121,7 +120,6 @@ static void attackguardian(PLAYER& plr, DWHActor* actor)
static void faceguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -153,15 +151,12 @@ static void faceguardian(PLAYER& plr, DWHActor* actor)
static void searchguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, true);
checksector6(actor);
}
static void fleeguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -200,7 +195,6 @@ static void fleeguardian(PLAYER& plr, DWHActor* actor)
static void painguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -213,7 +207,6 @@ static void painguardian(PLAYER& plr, DWHActor* actor)
static void castguardian(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -232,8 +225,8 @@ static void castguardian(PLAYER& plr, DWHActor* actor)
if (spr.picnum == GUARDIANATTACK + 6) {
spr.picnum = GUARDIAN;
spritesound(S_FIREBALL, &sprite[i]);
castspell(plr, i);
spritesound(S_FIREBALL, &spr);
castspell(plr, actor->GetSpriteIndex());
SetNewStatus(actor, CHASE);
}
checksector6(actor);

3
source/games/whaven/src/aiimp.cpp
View file

@ -166,7 +166,6 @@ static void resurectimp(PLAYER& plr, DWHActor* actor)
static void faceimp(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -277,8 +276,6 @@ static void attackimp(PLAYER& plr, DWHActor* actor)
static void searchimp(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplimp(plr, actor);

6
source/games/whaven/src/aijudy.cpp
View file

@ -74,7 +74,6 @@ static void chasejudy(PLAYER& plr, DWHActor* actor)
static void resurectjudy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -89,15 +88,12 @@ static void resurectjudy(PLAYER& plr, DWHActor* actor)
static void searchjudy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}
static void nukedjudy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -130,7 +126,6 @@ static void painjudy(PLAYER& plr, DWHActor* actor)
static void facejudy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.ang = getangle(plr.x - spr.x, plr.y - spr.y);
@ -342,7 +337,6 @@ static void castjudy(PLAYER& plr, DWHActor* actor)
static void diejudy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;

4
source/games/whaven/src/aikatie.cpp
View file

@ -64,7 +64,6 @@ static void chasekatie(PLAYER& plr, DWHActor* actor)
static void resurectkatie(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -79,8 +78,6 @@ static void resurectkatie(PLAYER& plr, DWHActor* actor)
static void searchkatie(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}
@ -104,7 +101,6 @@ static void painkatie(PLAYER& plr, DWHActor* actor)
static void facekatie(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.ang = (short)(getangle(plr.x - spr.x, plr.y - spr.y) & 2047);

2
source/games/whaven/src/aikobold.cpp
View file

@ -95,7 +95,6 @@ static void chasekobold(PLAYER& plr, DWHActor* actor)
static void diekobold(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -136,7 +135,6 @@ static void painkobold(PLAYER& plr, DWHActor* actor)
static void facekobold(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

4
source/games/whaven/src/aiminotaur.cpp
View file

@ -176,7 +176,6 @@ static void painminotaur(PLAYER& plr, DWHActor* actor)
static void faceminotaur(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -308,7 +307,6 @@ static void fleeminotaur(PLAYER& plr, DWHActor* actor)
static void frozenminotaur(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -321,8 +319,6 @@ static void frozenminotaur(PLAYER& plr, DWHActor* actor)
static void searchminotaur(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplminotaur(plr, actor);

3
source/games/whaven/src/ainewguy.cpp
View file

@ -164,8 +164,6 @@ static void skirmishnewguy(PLAYER& plr, DWHActor* actor)
static void searchnewguy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}
@ -199,7 +197,6 @@ static void painnewguy(PLAYER& plr, DWHActor* actor)
static void facenewguy(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

1
source/games/whaven/src/airat.cpp
View file

@ -27,7 +27,6 @@ static void facerat(PLAYER& plr, DWHActor* actor)
static void dierat(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
DeleteActor(actor);
}

5
source/games/whaven/src/aiskeleton.cpp
View file

@ -92,7 +92,6 @@ static void chaseskeleton(PLAYER& plr, DWHActor* actor)
static void dieskeleton(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -114,7 +113,6 @@ static void dieskeleton(PLAYER& plr, DWHActor* actor)
static void faceskeleton(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -188,7 +186,6 @@ static void fleeskeleton(PLAYER& plr, DWHActor* actor)
static void standskeleton(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.ang = getangle(plr.x - spr.x, plr.y - spr.y);
@ -268,8 +265,6 @@ static void resurectskeleton(PLAYER& plr, DWHActor* actor)
static void searchskeleton(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplskeleton(plr, actor);

4
source/games/whaven/src/aiskully.cpp
View file

@ -75,15 +75,12 @@ static void resurectskully(PLAYER& plr, DWHActor* actor)
static void searchskully(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
checksector6(actor);
}
static void nukedskully(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -116,7 +113,6 @@ static void painskully(PLAYER& plr, DWHActor* actor)
static void faceskully(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

3
source/games/whaven/src/aispider.cpp
View file

@ -134,8 +134,6 @@ static void skirmishspider(PLAYER& plr, DWHActor* actor)
static void searchspider(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
aisearch(plr, actor, false);
if (!checksector6(actor))
checkexplspider(plr, actor);
@ -155,7 +153,6 @@ static void frozenspider(PLAYER& plr, DWHActor* actor)
static void facespider(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
boolean cansee = ::cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),

8
source/games/whaven/src/aiwillow.cpp
View file

@ -7,7 +7,6 @@ static void willowDrain(PLAYER& plr, DWHActor* i);
static void chasewillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -72,7 +71,6 @@ static void chasewillow(PLAYER& plr, DWHActor* actor)
static void attackwillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -145,7 +143,6 @@ static void attackwillow(PLAYER& plr, DWHActor* actor)
static void facewillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
if (cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7),
@ -175,16 +172,12 @@ static void facewillow(PLAYER& plr, DWHActor* actor)
static void searchwillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
aisearch(plr, actor, true);
checksector6(actor);
}
static void fleewillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;
@ -220,7 +213,6 @@ static void fleewillow(PLAYER& plr, DWHActor* actor)
static void diewillow(PLAYER& plr, DWHActor* actor)
{
int i = actor->GetSpriteIndex();
SPRITE& spr = actor->s();
spr.lotag -= TICSPERFRAME;