zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-06-04 19:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to ZDoom r2005:

Browse source 
- fixed: Morph weapons weren't destroyed because the code checked for 
  them in the unmorphed player class.
- fixed: With padding the largest texture to fit into a page is 254x254.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@638 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
Christoph Oelckers 2009-11-28 07:49:53 +00:00
parent 0b257fca95
commit 088dfb6655
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/a_morph.cpp
View file

@ -177,7 +177,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
{
AWeapon *beastweap;
APlayerPawn *mo;
AActor *pmo;
APlayerPawn *pmo;
angle_t angle;
pmo = player->mo;
@ -330,7 +330,7 @@ bool P_UndoPlayerMorph (player_t *activator, player_t *player, int unmorphflag,
}
if (correctweapon)
{ // Better "lose morphed weapon" semantics
const PClass *morphweapon = PClass::FindClass (mo->MorphWeapon);
const PClass *morphweapon = PClass::FindClass (pmo->MorphWeapon);
if (morphweapon != NULL && morphweapon->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
{
AWeapon *OriginalMorphWeapon = static_cast<AWeapon *>(mo->FindInventory (morphweapon));