Commit 8f02b2ca authored by Richard Gobeille's avatar Richard Gobeille
Browse files

Fix return type of A_CheckHitSprite()

Since the returned value is a distance, it should be int32_t.

From-SVN: r8730
parent ff95c714
......@@ -2062,7 +2062,7 @@ ACTOR_STATIC void G_MoveStandables(void)
updatesectorneighbor(pSprite->x, pSprite->y, &curSectNum, 1024, 2048);
changespritesect(spriteNum, curSectNum);
int hitDist = A_CheckHitSprite(spriteNum, &hitSprite);
int32_t hitDist = A_CheckHitSprite(spriteNum, &hitSprite);
actor[spriteNum].lastv.x = hitDist;
pSprite->ang = oldAng;
......@@ -2129,7 +2129,7 @@ ACTOR_STATIC void G_MoveStandables(void)
setsprite(spriteNum, &pSprite->pos);
int hitDist = A_CheckHitSprite(spriteNum, NULL);
int32_t const hitDist = A_CheckHitSprite(spriteNum, NULL);
pSprite->pos.vec2 = { T4(spriteNum), T5(spriteNum) };
pSprite->z += (3<<8);
......
......@@ -3060,7 +3060,7 @@ CHECKINV1:
}
}
int A_CheckHitSprite(int spriteNum, int16_t *hitSprite)
int32_t A_CheckHitSprite(int spriteNum, int16_t *hitSprite)
{
hitdata_t hitData;
int32_t zOffset = 0;
......
......@@ -118,7 +118,7 @@ typedef struct {
void G_ActivateBySector(int sect,int spriteNum);
int S_FindMusicSFX(int sectNum, int *sndptr);
int A_CallSound(int sectNum,int spriteNum);
int A_CheckHitSprite(int spriteNum,int16_t *hitSprite);
int32_t A_CheckHitSprite(int spriteNum,int16_t *hitSprite);
void A_DamageObject_Duke3D(int spriteNum, int dmgSrc);
void A_DamageObject_Generic(int spriteNum, int dmgSrc);
void A_DamageObject(int spriteNum,int dmgSrc);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment