- Took MF2_WINDTHRUST off AMorphedMonster. This is something that should not
be a default setting. - Moved a_artiegg.cpp to g_shared and renamed it to a_morph.cpp to better reflect its meaning. - Fixed: AMorphProjectile's PlayerClass and MonsterClass members must be serialized as FNames. Serializing them as ints is not safe because name indices are not guaranteed to be the same each time the game is started. Same for APlayerPawn's MorphWeapon member. - Converted EggFX, ArtiEgg, PorkFX and ArtiPork to DECORATE. - Added a new parameter to A_FireCustomMissile. Previously it always aimed straight ahead and altered the projectile's angle according to the resulting direction. If the 6th parameter is 1 now it will aim at the specified angle directly. - Changed custom morphing to be based on a new MorphProjectile class, not the Heretic specific EggFX. The EggFX properties are now prefixed with 'MorphProjectile.'. SVN r297 (trunk)
This commit is contained in:
parent
a6d656b108
commit
f66b7de8c8
17 changed files with 753 additions and 792 deletions
|
|
@ -46,7 +46,6 @@
|
|||
#include "w_wad.h"
|
||||
#include "a_strifeglobal.h"
|
||||
#include "thingdef.h"
|
||||
#include "ravenshared.h"
|
||||
|
||||
void FActorInfo::BuildDefaults ()
|
||||
{
|
||||
|
|
@ -130,7 +129,6 @@ static void ApplyActorDefault (int defnum, const char *datastr, int dataint)
|
|||
ASigil *const sigil = (ASigil *)sgDefaults;
|
||||
AAmmo *const ammo = (AAmmo *)sgDefaults;
|
||||
APlayerPawn *const player = (APlayerPawn *)sgDefaults;
|
||||
AEggFX *const eggfx = (AEggFX *)sgDefaults;
|
||||
|
||||
switch (defnum)
|
||||
{
|
||||
|
|
@ -342,10 +340,6 @@ static void ApplyActorDefault (int defnum, const char *datastr, int dataint)
|
|||
player->ScoreIcon = TexMan.AddPatch (datastr, ns_sprites);
|
||||
}
|
||||
break;
|
||||
|
||||
case ADEF_EggFX_PlayerClass: eggfx->PlayerClass = FName(datastr); break;
|
||||
case ADEF_EggFX_MonsterClass: eggfx->MonsterClass = FName(datastr); break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue