Dehacked Misc support: Controls for the armor and armor class set when

using the ammo cheats.

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

2 files changed, 43 insertions, 16 deletions

diff --git a/src/deh_misc.c b/src/deh_misc.c
index 6fa71382..bea0a7a1 100644
--- a/src/deh_misc.c
+++ b/src/deh_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: deh_misc.c 208 2005-10-17 21:02:57Z fraggle $
+// $Id: deh_misc.c 209 2005-10-17 21:09:01Z fraggle $
 //
 // Copyright(C) 2005 Simon Howard
 //
@@ -21,6 +21,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.6  2005/10/17 21:09:01  fraggle
+// Dehacked Misc support: Controls for the armor and armor class set when
+// using the ammo cheats.
+//
 // Revision 1.5  2005/10/17 21:02:57  fraggle
 // Dehacked Misc support: Max soulsphere, Soulsphere+Megasphere health bonus
 // values, God mode health value
@@ -119,14 +123,33 @@ int deh_megasphere_health = 200;
 
 // Dehacked: "God mode health"
 // This is what the health value is set to when cheating using
-// the IDDQD god mode cheat.
+// the IDDQD god mode cheat.  See ST_Responder in st_stuff.c
 
 int deh_god_mode_health = 100;
 
-int deh_idfa_armor;                 // TODO
-int deh_idfa_armor_class;           // TODO
-int deh_idkfa_armor;                // TODO
-int deh_idkfa_armor_class;          // TODO
+// Dehacked: "IDFA Armor"
+// This is what the armor is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor = 200;
+
+// Dehacked: "IDFA Armor Class"
+// This is what the armor class is set to when using the IDFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idfa_armor_class = 2;
+
+// Dehacked: "IDKFA Armor"
+// This is what the armor is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor = 200;
+
+// Dehacked: "IDKFA Armor Class"
+// This is what the armor class is set to when using the IDKFA cheat.
+// See ST_Responder in st_stuff.c
+
+int deh_idkfa_armor_class = 2;
 
 // Dehacked: "BFG Cells/Shot"
 // This is the number of CELLs firing the BFG uses up.
@@ -152,10 +175,10 @@ static struct
     {"Soulsphere Health",   &deh_soulsphere_health,     true},
     {"Megasphere Health",   &deh_megasphere_health,     true},
     {"God Mode Health",     &deh_god_mode_health,       true},
-    {"IDFA Armor",          &deh_idfa_armor},
-    {"IDFA Armor Class",    &deh_idfa_armor_class},
-    {"IDKFA Armor",         &deh_idkfa_armor},
-    {"IDKFA Armor Class",   &deh_idkfa_armor_class},
+    {"IDFA Armor",          &deh_idfa_armor,            true},
+    {"IDFA Armor Class",    &deh_idfa_armor_class,      true},
+    {"IDKFA Armor",         &deh_idkfa_armor,           true},
+    {"IDKFA Armor Class",   &deh_idkfa_armor_class,     true},
     {"BFG Cells/Shot",      &deh_bfg_cells_per_shot,    true},
     {"Monsters Infight",    &deh_monsters_infight},
 };
diff --git a/src/st_stuff.c b/src/st_stuff.c
index d0031502..353a44ac 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: st_stuff.c 208 2005-10-17 21:02:57Z fraggle $
+// $Id: st_stuff.c 209 2005-10-17 21:09:01Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.9  2005/10/17 21:09:01  fraggle
+// Dehacked Misc support: Controls for the armor and armor class set when
+// using the ammo cheats.
+//
 // Revision 1.8  2005/10/17 21:02:57  fraggle
 // Dehacked Misc support: Max soulsphere, Soulsphere+Megasphere health bonus
 // values, God mode health value
@@ -56,7 +60,7 @@
 //-----------------------------------------------------------------------------
 
 static const char
-rcsid[] = "$Id: st_stuff.c 208 2005-10-17 21:02:57Z fraggle $";
+rcsid[] = "$Id: st_stuff.c 209 2005-10-17 21:09:01Z fraggle $";
 
 
 #include <stdio.h>
@@ -522,8 +526,8 @@ ST_Responder (event_t* ev)
       // 'fa' cheat for killer fucking arsenal
       else if (cht_CheckCheat(&cheat_ammonokey, ev->data1))
       {
-	plyr->armorpoints = 200;
-	plyr->armortype = 2;
+	plyr->armorpoints = deh_idfa_armor;
+	plyr->armortype = deh_idfa_armor_class;
 	
 	for (i=0;i<NUMWEAPONS;i++)
 	  plyr->weaponowned[i] = true;
@@ -536,8 +540,8 @@ ST_Responder (event_t* ev)
       // 'kfa' cheat for key full ammo
       else if (cht_CheckCheat(&cheat_ammo, ev->data1))
       {
-	plyr->armorpoints = 200;
-	plyr->armortype = 2;
+	plyr->armorpoints = deh_idkfa_armor;
+	plyr->armortype = deh_idkfa_armor_class;
 	
 	for (i=0;i<NUMWEAPONS;i++)
 	  plyr->weaponowned[i] = true;