OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r314 (trunk)

Browse source
This commit is contained in:
Randy Heit 2006-08-31 00:16:12 +00:00
commit 603e905c42
35 changed files with 363 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/g_shared/a_morph.cpp
View file

@ -302,11 +302,11 @@ int AMorphProjectile::DoSpecialDamage (AActor *target, int damage)
{
if (target->player)
{
P_MorphPlayer (target->player, PClass::FindClass (ENamedName(PlayerClass)));
P_MorphPlayer (target->player, PClass::FindClass (PlayerClass));
}
else
{
P_MorphMonster (target, PClass::FindClass (ENamedName(MonsterClass)));
P_MorphMonster (target, PClass::FindClass (MonsterClass));
}
return -1;
}
@ -314,18 +314,7 @@ int AMorphProjectile::DoSpecialDamage (AActor *target, int damage)
void AMorphProjectile::Serialize (FArchive &arc)
{
Super::Serialize (arc);
// Hack alert: The classes have to be serialized as names.
// But due to the way an actor is constructed they cannot
// be declared as names.
FName PlayerClassName = ENamedName(PlayerClass);
FName MonsterClassName = ENamedName(MonsterClass);
arc << PlayerClassName << MonsterClassName;
PlayerClass = PlayerClassName;
MonsterClass = MonsterClassName;
arc << PlayerClass << MonsterClass;
}