OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Split thingdef.cpp into several files so that the state and property code

Browse source 
no longer gets in the way of the main parser.
- Changed A_MissileAttack, A_MeleeAttack and A_ComboAttack so that they use
  metadata. Now all the hack code associated with these functions can be removed.


SVN r538 (trunk)
This commit is contained in:
Christoph Oelckers 2007-05-28 22:18:51 +00:00
commit 8f6fdc1d21
14 changed files with 5303 additions and 5235 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/thingdef_codeptr.cpp
View file

@ -202,14 +202,27 @@ void A_UnsetFloat(AActor * self)
static void DoAttack (AActor *self, bool domelee, bool domissile)
{
int index=CheckIndex(4);
int MeleeDamage;
int MeleeSound;
FName MissileName;
fixed_t MissileHeight;
if (index<0) return;
if (self->target == NULL) return;
int MeleeDamage=StateParameters[index];
int MeleeSound=StateParameters[index+1];
FName MissileName=(ENamedName)StateParameters[index+2];
fixed_t MissileHeight=StateParameters[index+3];
if (index > 0)
{
MeleeDamage=StateParameters[index];
MeleeSound=StateParameters[index+1];
MissileName=(ENamedName)StateParameters[index+2];
MissileHeight=StateParameters[index+3];
}
else
{
MeleeDamage = self->GetClass()->Meta.GetMetaInt (ACMETA_MeleeDamage, 0);
MeleeSound = self->GetClass()->Meta.GetMetaInt (ACMETA_MeleeSound, 0);
MissileName=(ENamedName) self->GetClass()->Meta.GetMetaInt (ACMETA_MissileName, NAME_None);
MissileHeight= self->GetClass()->Meta.GetMetaFixed (ACMETA_MissileHeight, 32*FRACUNIT);
}
A_FaceTarget (self);
if (domelee && MeleeDamage>0 && self->CheckMeleeRange ())