SVN r314 (trunk)

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

View file

@ -400,12 +400,8 @@ void APlayerPawn::Serialize (FArchive &arc)
<< SideMove2
<< ScoreIcon
<< InvFirst
<< InvSel;
// Serialize the name, not the index
FName MorphWeaponName = ENamedName(MorphWeapon);
arc << MorphWeaponName;
MorphWeapon = MorphWeaponName;
<< InvSel
<< MorphWeapon;
}
//===========================================================================
@ -917,7 +913,7 @@ void APlayerPawn::MorphPlayerThink ()
void APlayerPawn::ActivateMorphWeapon ()
{
const PClass *morphweapon = PClass::FindClass (ENamedName(MorphWeapon));
const PClass *morphweapon = PClass::FindClass (MorphWeapon);
player->PendingWeapon = WP_NOCHANGE;
player->psprites[ps_weapon].sy = WEAPONTOP;