Fix bugs for DarkDefender

git-svn-id: https://svn.eduke32.com/eduke32@1684 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2010-08-07 22:38:15 +00:00
parent 2f15e237f7
commit 219b3204dd
2 changed files with 8 additions and 9 deletions

View file

@ -510,10 +510,11 @@ GAMEEXEC_STATIC void VM_Move(void)
vm.g_sp->ang += angdif;
}
moveptr = (intptr_t *)vm.g_t[1];
if ((moveptr = (intptr_t *)vm.g_t[1]) >= &script[0] && moveptr <= (&script[0]+g_scriptSize))
{
if (a&geth) vm.g_sp->xvel += ((*moveptr)-vm.g_sp->xvel)>>1;
if (a&getv) vm.g_sp->zvel += ((*(moveptr+1)<<4)-vm.g_sp->zvel)>>1;
}
if (a&dodgebullet && !deadflag)
A_Dodge(vm.g_sp);

View file

@ -4291,13 +4291,11 @@ void P_ProcessWeapon(int32_t snum)
p->pos.z = p->opos.z;
p->posvel.z = 0;
}
if (*kb == aplWeaponSound2Time[p->curr_weapon][snum])
{
if (aplWeaponSound2Sound[p->curr_weapon][snum])
{
if (aplWeaponSound2Sound[p->curr_weapon][snum] > 0)
A_PlaySound(aplWeaponSound2Sound[p->curr_weapon][snum],p->i);
}
}
if (*kb == aplWeaponSpawnTime[p->curr_weapon][snum])
P_DoWeaponSpawn(p);