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

git-svn-id: https://svn.eduke32.com/eduke32@1459 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2009-07-13 06:55:00 +00:00
parent 3504c0bf97
commit 20a251d155
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -865,7 +865,7 @@ int32_t A_IncurDamage(int32_t sn)
}
}
if (A_CheckSpriteTileFlags(ActorExtra[sn].picnum,SPRITE_PROJECTILE) && (ActorExtra[sn].projectile->workslike & PROJECTILE_RPG))
if (A_CheckSpriteTileFlags(ActorExtra[sn].picnum,SPRITE_PROJECTILE) && (SpriteProjectile[sn].workslike & PROJECTILE_RPG))
{
g_player[p].ps->posxv +=
ActorExtra[sn].extra*(sintable[(ActorExtra[sn].ang+512)&2047])<<2;

4
polymer/eduke32/source/player.c
View file

@ -585,7 +585,7 @@ int32_t A_Shoot(int32_t i,int32_t atwith)
if (hitinfo.hitwall >= 0 || hitinfo.hitsprite >= 0)
{
j = A_InsertSprite(hitinfo.hitsect,hitinfo.pos.x,hitinfo.pos.y,hitinfo.pos.z,atwith,-15,0,0,sa,32,0,i,4);
ActorExtra[j].projectile->workslike = ProjectileData[sprite[j].picnum].workslike;
SpriteProjectile[j].workslike = ProjectileData[sprite[j].picnum].workslike;
sprite[j].extra = ProjectileData[atwith].extra;
if (ProjectileData[atwith].extra_rand > 0)
sprite[j].extra += (krand()&ProjectileData[atwith].extra_rand);
@ -1076,7 +1076,7 @@ DOSKIPBULLETHOLE:
if (ProjectileData[atwith].clipdist >= 0) sprite[j].clipdist = ProjectileData[atwith].clipdist;
else sprite[j].clipdist = 40;
Bmemcpy(&ActorExtra[j].projectile, &ProjectileData[sprite[j].picnum], sizeof(ProjectileData[sprite[j].picnum]));
Bmemcpy(&SpriteProjectile[j], &ProjectileData[sprite[j].picnum], sizeof(ProjectileData[sprite[j].picnum]));
// sa = s->ang+32-(krand()&63);
// zvel = oldzvel+512-(krand()&1023);

4
polymer/eduke32/source/sector.c
View file

@ -1611,7 +1611,7 @@ void A_DamageWall(int32_t spr,int32_t dawallnum,const vec3_t *pos,int32_t atwith
int32_t j, i, darkestwall;
walltype *wal = &wall[dawallnum];
if (wal->overpicnum == MIRROR && wal->pal != 4 && A_CheckSpriteTileFlags(atwith,SPRITE_PROJECTILE) && (ActorExtra[spr].projectile->workslike & PROJECTILE_RPG))
if (wal->overpicnum == MIRROR && wal->pal != 4 && A_CheckSpriteTileFlags(atwith,SPRITE_PROJECTILE) && (SpriteProjectile[spr].workslike & PROJECTILE_RPG))
{
if (wal->nextwall == -1 || wall[wal->nextwall].pal != 4)
{
@ -1950,7 +1950,7 @@ void A_DamageObject(int32_t i,int32_t sn)
i &= (MAXSPRITES-1);
if (A_CheckSpriteFlags(sn,SPRITE_PROJECTILE))
if (ActorExtra[sn].projectile->workslike & PROJECTILE_RPG)
if (SpriteProjectile[sn].workslike & PROJECTILE_RPG)
rpg = 1;
switchpicnum = PN;
if ((PN > WATERFOUNTAIN)&&(PN < WATERFOUNTAIN+3))