SVN r314 (trunk)
This commit is contained in:
parent
2fb55622e7
commit
603e905c42
35 changed files with 363 additions and 197 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue