diff --git a/source/games/duke/src/actors_lava.cpp b/source/games/duke/src/actors_lava.cpp index 0da2d7f24..87cb045d4 100644 --- a/source/games/duke/src/actors_lava.cpp +++ b/source/games/duke/src/actors_lava.cpp @@ -189,9 +189,9 @@ void addminecart(int p1, int p2, int i, int iht, int p3, int childsectnum) void dotorch(void) { int ds; - short j; - short startwall, endwall; - char shade; + int j; + int startwall, endwall; + uint8_t shade; ds = krand()&8; for (int i = 0; i < torchcnt; i++) { @@ -377,11 +377,11 @@ void dojaildoor(void) void moveminecart(void) { - short i; - short j; - short csect; - short startwall; - short endwall; + int i; + int j; + int csect; + int startwall; + int endwall; int speed; int y; int x; @@ -561,7 +561,7 @@ void thunder(void) { struct player_struct* p; int r1, r2; - short startwall, endwall, i, j; + int startwall, endwall, i, j; uint8_t shade; p = &ps[screenpeek]; diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index d78276609..c33c4fe36 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -2704,7 +2704,7 @@ void processinput_d(int snum) int j, k, doubvel, fz, cz, truefdist; Collision chz, clz; bool shrunk; - short psect, psectlotag; + int psect, psectlotag; struct player_struct* p; spritetype* s; diff --git a/source/games/duke/src/premap_d.cpp b/source/games/duke/src/premap_d.cpp index 9f23e701f..c6741a415 100644 --- a/source/games/duke/src/premap_d.cpp +++ b/source/games/duke/src/premap_d.cpp @@ -274,7 +274,7 @@ void cacheit_d(void) void prelevel_d(int g) { - short i, j, startwall, endwall, lotaglist; + int i, j, startwall, endwall, lotaglist; short lotags[65]; prelevel_common(g); diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp index 5e01ad7b1..9ba6f577e 100644 --- a/source/games/duke/src/sectors_r.cpp +++ b/source/games/duke/src/sectors_r.cpp @@ -976,7 +976,7 @@ static void lotsofpopcorn(DDukeActor *actor, int wallnum, int n) void checkhitwall_r(DDukeActor* spr, int dawallnum, int x, int y, int z, int atwith) { - short j, i; + int j, i; int sn = -1, darkestwall; walltype* wal; spritetype* s;