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

Fix the bug I caused with custom projectiles :p

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3067 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-10-11 03:25:10 +00:00
parent 084ec632ea
commit 83dd447621
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
polymer/eduke32/source/actors.c
View file

@ -2539,22 +2539,13 @@ ACTOR_STATIC void G_MoveWeapons(void)
if (proj->workslike & PROJECTILE_SPIT && s->zvel < 6144)
s->zvel += g_spriteGravity-112;
k = s->xvel;
ll = s->zvel;
if (sector[s->sectnum].lotag == 2)
{
k >>= 1;
ll >>= 1;
}
A_GetZLimits(i);
if (proj->trail >= 0)
{
int32_t f;
int32_t cnt;
for (f=0; f<=proj->tnum; f++)
for (cnt=0; cnt<=proj->tnum; cnt++)
{
j = A_Spawn(i,proj->trail);
@ -2568,18 +2559,31 @@ ACTOR_STATIC void G_MoveWeapons(void)
}
}
do
{
vec3_t tmpvect;
Bmemcpy(&davect, s, sizeof(vec3_t));
int32_t cnt = proj->movecnt;
tmpvect.x = (k*(sintable[(s->ang+512)&2047]))>>14;
tmpvect.y = (k*(sintable[s->ang&2047]))>>14;
tmpvect.z = ll;
k = s->xvel;
ll = s->zvel;
j = A_MoveSprite(i, &tmpvect, CLIPMASK1);
if (sector[s->sectnum].lotag == 2)
{
k >>= 1;
ll >>= 1;
}
do
{
vec3_t tmpvect;
Bmemcpy(&davect, s, sizeof(vec3_t));
tmpvect.x = (k*(sintable[(s->ang+512)&2047]))>>14;
tmpvect.y = (k*(sintable[s->ang&2047]))>>14;
tmpvect.z = ll;
j = A_MoveSprite(i, &tmpvect, CLIPMASK1);
}
while (!j && --cnt > 0);
}
while (!j && --proj->movecnt);
if (!(proj->workslike & PROJECTILE_BOUNCESOFFWALLS) &&
s->yvel >= 0 && sprite[s->yvel].sectnum != MAXSECTORS)