shithub: choc

Info  •  Files  •  Log  •  Branches

Always set armor class to 2 when picking up a megasphere (thanks
entryway).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1145

--- a/src/deh_misc.c

+++ b/src/deh_misc.c

@@ -72,9 +72,8 @@

 // This is the armor class that is given when picking up the blue 

 // armor or a megasphere. See P_TouchSpecialThing in p_inter.c

 //

-// Question: Does DOS dehacked modify the megasphere behavior 

-// as well as the blue armor behavior?  I am currently following

-// the Boom behavior, which is "yes".

+// DOS dehacked only modifies the MegaArmor behavior and not

+// the MegaSphere, which always gives armor type 2.

 int deh_blue_armor_class = DEH_DEFAULT_BLUE_ARMOR_CLASS;

--- a/src/p_inter.c

+++ b/src/p_inter.c

@@ -411,7 +411,9 @@

 	    return;

 	player->health = deh_megasphere_health;

 	player->mo->health = player->health;

-	P_GiveArmor (player, deh_blue_armor_class);

+        // We always give armor type 2 for the megasphere; dehacked only 

+        // affects the MegaArmor.

+	P_GiveArmor (player, 2);

 	player->message = DEH_String(GOTMSPHERE);

 	sound = sfx_getpow;

 	break;