- eliminated a few overlooked 'long's.

This commit is contained in:
Christoph Oelckers 2020-10-02 22:14:20 +02:00
parent 4e67197838
commit 57945d2baf
7 changed files with 8 additions and 8 deletions

View File

@ -4804,7 +4804,7 @@ void makeitfall(int i)
int dodge(spritetype* s)
{
short i;
long bx, by, mx, my, bxvect, byvect, mxvect, myvect, d;
int bx, by, mx, my, bxvect, byvect, mxvect, myvect, d;
mx = s->x;
my = s->y;

View File

@ -4147,7 +4147,7 @@ void move_d(int g_i, int g_p, int g_x)
if (a & face_player_smart)
{
long newx, newy;
int newx, newy;
newx = ps[g_p].posx + (ps[g_p].posxv / 768);
newy = ps[g_p].posy + (ps[g_p].posyv / 768);

View File

@ -4168,7 +4168,7 @@ void move_r(int g_i, int g_p, int g_x)
if (a & face_player_smart)
{
long newx, newy;
int newx, newy;
newx = ps[g_p].posx + (ps[g_p].posxv / 768);
newy = ps[g_p].posy + (ps[g_p].posyv / 768);

View File

@ -488,7 +488,7 @@ static int getlabeloffset(LABELS* pLabel, const char* psz)
{
// find the label psz in the table pLabel.
// returns the offset in the array for the label, or -1
long l = -1;
int l = -1;
int i;
for (i = 0; pLabel[i].lId >= 0; i++)

View File

@ -42,7 +42,7 @@ BEGIN_DUKE_NS
void incur_damage_r(struct player_struct* p)
{
long damage = 0L, unk = 0L, shield_damage = 0L;
int damage = 0, unk = 0, shield_damage = 0;
short gut = 0;
sprite[p->i].extra -= p->extra_extra8 >> 8;

View File

@ -348,8 +348,8 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
p->getang(), (k + (p->hbomb_hold_delay << 5)), i, pi, 1);
{
long lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, -1, snum);
long lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, -1, snum);
int lGrenadeLifetime = GetGameVar("GRENADE_LIFETIME", NAM_GRENADE_LIFETIME, -1, snum);
int lGrenadeLifetimeVar = GetGameVar("GRENADE_LIFETIME_VAR", NAM_GRENADE_LIFETIME_VAR, -1, snum);
// set timer. blows up when at zero....
sprite[j].extra = lGrenadeLifetime
+ mulscale(krand(), lGrenadeLifetimeVar, 14)

View File

@ -925,7 +925,7 @@ void activatebysector_r(int sect, int j)
static void lotsofpopcorn(short i, short wallnum, short n)
{
long j, xv, yv, z, x1, y1;
int j, xv, yv, z, x1, y1;
short sect, a;
sect = -1;