zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use correct formula for bullet hitscan

Browse source
This commit is contained in:
nukeykt 2019-10-28 01:36:25 +09:00 committed by Christoph Oelckers
parent d85c5d8dd8
commit c2f30de350
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/exhumed/src/bullet.cpp
View file

@ -382,7 +382,12 @@ MOVEEND:
{ {
vec3_t startPos = { x, y, z }; vec3_t startPos = { x, y, z };
hitdata_t hitData; hitdata_t hitData;
hitscan(&startPos, pSprite->sectnum, Cos(pSprite->ang), Sin(pSprite->ang), (-Sin(pBullet->field_C)) << 3, &hitData, CLIPMASK1); int dz;
if (bVanilla)
dz = -Sin(pBullet->field_C) * 8;
else
dz = -pBullet->field_C * 512;
hitscan(&startPos, pSprite->sectnum, Cos(pSprite->ang), Sin(pSprite->ang), dz, &hitData, CLIPMASK1);
x2 = hitData.pos.x; x2 = hitData.pos.x;
y2 = hitData.pos.y; y2 = hitData.pos.y;
z2 = hitData.pos.z; z2 = hitData.pos.z;
@ -633,7 +638,7 @@ int BuildBullet(short nSprite, int nType, int ebx, int ecx, int val1, int nAngle
sprite[nBulletSprite].cstat |= 0x8000; sprite[nBulletSprite].cstat |= 0x8000;
} }
pBullet->field_C = val2 & 0x7FF; // TODO - anglemask? pBullet->field_C = val2;
pBullet->nType = nType; pBullet->nType = nType;
pBullet->nSprite = nBulletSprite; pBullet->nSprite = nBulletSprite;
pBullet->field_6 = runlist_AddRunRec(sprite[nBulletSprite].lotag - 1, nBullet | 0xB0000); pBullet->field_6 = runlist_AddRunRec(sprite[nBulletSprite].lotag - 1, nBullet | 0xB0000);

2
source/exhumed/src/exhumed.cpp
View file

@ -628,6 +628,8 @@ short scan_char = 0;
int nStartLevel; int nStartLevel;
int nTimeLimit; int nTimeLimit;
int bVanilla = 0;
char debugBuffer[256]; char debugBuffer[256];
short wConsoleNode; // TODO - move me into network file short wConsoleNode; // TODO - move me into network file

2
source/exhumed/src/exhumed.h
View file

@ -184,6 +184,8 @@ extern const char *gString[];
extern short bNoSound; extern short bNoSound;
extern int bVanilla;
extern char g_modDir[BMAX_PATH]; extern char g_modDir[BMAX_PATH];
enum { enum {
kPalNormal = 0, kPalNormal = 0,