teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix return type of A_CheckHitSprite()

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

git-svn-id: https://svn.eduke32.com/eduke32@8730 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2020-03-12 01:05:37 +00:00 committed by Christoph Oelckers
parent 4bdffa4f0f
commit 2e17467a8f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/duke3d/src/actors.cpp
View file

@ -2066,7 +2066,7 @@ ACTOR_STATIC void G_MoveStandables(void)
updatesectorneighbor(pSprite->x, pSprite->y, &curSectNum, 1024, 2048); updatesectorneighbor(pSprite->x, pSprite->y, &curSectNum, 1024, 2048);
changespritesect(spriteNum, curSectNum); changespritesect(spriteNum, curSectNum);
int hitDist = A_CheckHitSprite(spriteNum, &hitSprite); int32_t hitDist = A_CheckHitSprite(spriteNum, &hitSprite);
actor[spriteNum].lastv.x = hitDist; actor[spriteNum].lastv.x = hitDist;
pSprite->ang = oldAng; pSprite->ang = oldAng;
@ -2133,7 +2133,7 @@ ACTOR_STATIC void G_MoveStandables(void)
setsprite(spriteNum, &pSprite->pos); 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->pos.vec2 = { T4(spriteNum), T5(spriteNum) };
pSprite->z += (3<<8); pSprite->z += (3<<8);

2
source/duke3d/src/sector.cpp
View file

@ -3064,7 +3064,7 @@ CHECKINV1:
} }
} }
int A_CheckHitSprite(int spriteNum, int16_t *hitSprite) int32_t A_CheckHitSprite(int spriteNum, int16_t *hitSprite)
{ {
hitdata_t hitData; hitdata_t hitData;
int32_t zOffset = 0; int32_t zOffset = 0;

2
source/duke3d/src/sector.h
View file

@ -110,7 +110,7 @@ typedef struct {
void G_ActivateBySector(int sect,int spriteNum); void G_ActivateBySector(int sect,int spriteNum);
int S_FindMusicSFX(int sectNum, int *sndptr); int S_FindMusicSFX(int sectNum, int *sndptr);
int A_CallSound(int sectNum,int spriteNum); 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_Duke3D(int spriteNum, int dmgSrc);
void A_DamageObject_Generic(int spriteNum, int dmgSrc); void A_DamageObject_Generic(int spriteNum, int dmgSrc);
void A_DamageObject(int spriteNum,int dmgSrc); void A_DamageObject(int spriteNum,int dmgSrc);