zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- RR: Use int instead of short in bowling functions.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-07 09:58:09 +01:00
parent b13398c268
commit 887279f8a5
2 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/duke/src/actors_r.cpp
View file

@ -38,10 +38,10 @@ void dojaildoor();
void moveminecart(); void moveminecart();
void ballreturn(DDukeActor* spr); void ballreturn(DDukeActor* spr);
short pinsectorresetdown(short sect); void pinsectorresetdown(int sect);
short pinsectorresetup(short sect); int pinsectorresetup(int sect);
short checkpins(short sect); int checkpins(int sect);
void resetpins(short sect); void resetpins(int sect);
void resetlanepics(void); void resetlanepics(void);

33
source/games/duke/src/bowling.cpp
View file

@ -57,7 +57,7 @@ void ballreturn(DDukeActor *ball)
} }
} }
short pinsectorresetdown(short sect) void pinsectorresetdown(int sect)
{ {
int j = getanimationgoal(anim_ceilingz, sect); int j = getanimationgoal(anim_ceilingz, sect);
@ -65,12 +65,10 @@ short pinsectorresetdown(short sect)
{ {
j = sector[sect].floorz; j = sector[sect].floorz;
setanimation(sect, anim_ceilingz, sect, j, 64); setanimation(sect, anim_ceilingz, sect, j, 64);
return 1;
} }
return 0;
} }
short pinsectorresetup(short sect) int pinsectorresetup(int sect)
{ {
int j = getanimationgoal(anim_ceilingz, sect); int j = getanimationgoal(anim_ceilingz, sect);
@ -83,15 +81,12 @@ short pinsectorresetup(short sect)
return 0; return 0;
} }
short checkpins(short sect) int checkpins(int sect)
{ {
short i, pin;
int x, y; int x, y;
short pins[10]; bool pins[10] = {};
short tag; int tag = 0;
int pin = 0;
pin = 0;
for (i = 0; i < 10; i++) pins[i] = 0;
DukeSectIterator it(sect); DukeSectIterator it(sect);
while (auto a2 = it.Next()) while (auto a2 = it.Next())
@ -99,7 +94,7 @@ short checkpins(short sect)
if (a2->s->picnum == BOWLINGPIN) if (a2->s->picnum == BOWLINGPIN)
{ {
pin++; pin++;
pins[a2->s->lotag] = 1; pins[a2->s->lotag] = true;
} }
if (a2->s->picnum == BOWLINGPINSPOT) if (a2->s->picnum == BOWLINGPINSPOT)
{ {
@ -112,9 +107,9 @@ short checkpins(short sect)
tag += LANEPICS + 1; tag += LANEPICS + 1;
TileFiles.tileMakeWritable(tag); TileFiles.tileMakeWritable(tag);
tileCopySection(LANEPICS + 1, 0, 0, 128, 64, tag, 0, 0); tileCopySection(LANEPICS + 1, 0, 0, 128, 64, tag, 0, 0);
for (i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
if (pins[i] == 1) if (pins[i])
{ {
switch (i) switch (i)
{ {
@ -167,7 +162,7 @@ short checkpins(short sect)
return pin; return pin;
} }
void resetpins(short sect) void resetpins(int sect)
{ {
int i, tag; int i, tag;
int x, y; int x, y;
@ -256,16 +251,14 @@ void resetlanepics(void)
{ {
if (!isRR()) return; if (!isRR()) return;
int x, y; int x, y;
short i; for (int tag = 0; tag < 4; tag++)
short tag, pic;
for (tag = 0; tag < 4; tag++)
{ {
pic = tag + 1; int pic = tag + 1;
if (pic == 0) continue; if (pic == 0) continue;
pic += LANEPICS + 1; pic += LANEPICS + 1;
TileFiles.tileMakeWritable(pic); TileFiles.tileMakeWritable(pic);
tileCopySection(LANEPICS + 1, 0, 0, 128, 64, pic, 0, 0); tileCopySection(LANEPICS + 1, 0, 0, 128, 64, pic, 0, 0);
for (i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
switch (i) switch (i)
{ {