shithub: choc

Info  •  Files  •  Log  •  Branches

Update dehacked field names for beginnings of SeHacked support.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2046

--- a/src/strife/deh_cheat.c

+++ b/src/strife/deh_cheat.c

@@ -44,22 +44,22 @@

 static deh_cheat_t allcheats[] =

 {

     {"Change music",        &cheat_mus },

-    {"Chainsaw",            &cheat_choppers },

+    {"Level Warp",          &cheat_clev },

+    {"Stealth Boots",       NULL }, // STRIFE-TODO

+    {"Sigil piece",         NULL }, // STRIFE-TODO

+    {"FPS",                 NULL }, // STRIFE-TODO

+    {"TeleportMapSpot",     NULL }, // STRIFE-TODO

+    {"Gold&StatTokens",     NULL }, // STRIFE-TODO

     {"God mode",            &cheat_god },

-    {"Ammo & Keys",         &cheat_ammo },

-    {"Ammo",                &cheat_ammonokey },

-    {"No Clipping 1",       &cheat_noclip },

-    {"No Clipping 2",       &cheat_commercial_noclip },

-    {"Invincibility",       &cheat_powerup[0] },

+    {"Keys",                NULL }, // STRIFE-TODO

+    {"Weapons & Ammo",      NULL }, // STRIFE-TODO

+    {"Massacre",            NULL }, // STRIFE-TODO

+    {"No Clipping",         &cheat_noclip },

     {"Berserk",             &cheat_powerup[1] },

     {"Invisibility",        &cheat_powerup[2] },

-    {"Radiation Suit",      &cheat_powerup[3] },

-    {"Auto-map",            &cheat_powerup[4] },

-    {"Lite-Amp Goggles",    &cheat_powerup[5] },

-    {"BEHOLD menu",         &cheat_powerup[6] },

-    {"Level Warp",          &cheat_clev },

-    {"Player Position",     &cheat_mypos },

-    {"Map cheat",           &cheat_amap },

+    {"Enviro Suit",         &cheat_powerup[3] },

+    {"Health",              NULL }, // STRIFE-TODO

+    {"Backpack",            NULL }, // STRIFE-TODO

 };

 static deh_cheat_t *FindCheatByName(char *name)

--- a/src/strife/deh_frame.c

+++ b/src/strife/deh_frame.c

@@ -41,9 +41,7 @@

   DEH_MAPPING("Sprite subnumber", frame)

   DEH_MAPPING("Duration",         tics)

   DEH_MAPPING("Next frame",       nextstate)

-  //DEH_MAPPING("Unknown 1",        misc1)  // villsa [STRIFE] unused

-  //DEH_MAPPING("Unknown 2",        misc2)  // villsa [STRIFE] unused

-  DEH_UNSUPPORTED_MAPPING("Codep frame")

+  DEH_UNSUPPORTED_MAPPING("Action pointer")

 DEH_END_MAPPING

 static void *DEH_FrameStart(deh_context_t *context, char *line)

--- a/src/strife/deh_misc.c

+++ b/src/strife/deh_misc.c

@@ -148,8 +148,8 @@

     {"Initial Bullets",     &deh_initial_bullets},

     {"Max Health",          &deh_max_health},

     {"Max Armor",           &deh_max_armor},

-    {"Green Armor Class",   &deh_green_armor_class},

-    {"Blue Armor Class",    &deh_blue_armor_class},

+    {"LeatherArmorClass",   &deh_green_armor_class},

+    {"Metal Armor Class",   &deh_blue_armor_class},

     {"Max Soulsphere",      &deh_max_soulsphere},

     {"Soulsphere Health",   &deh_soulsphere_health},

     {"Megasphere Health",   &deh_megasphere_health},

@@ -158,7 +158,7 @@

     {"IDFA Armor Class",    &deh_idfa_armor_class},

     {"IDKFA Armor",         &deh_idkfa_armor},

     {"IDKFA Armor Class",   &deh_idkfa_armor_class},

-    {"BFG Cells/Shot",      &deh_bfg_cells_per_shot},

+    {"Mauler Cells/Shot",   &deh_bfg_cells_per_shot},

 };

 static void *DEH_MiscStart(deh_context_t *context, char *line)

@@ -199,7 +199,7 @@

             DEH_Warning(context, 

                         "Invalid value for 'Monsters Infight': %i", ivalue);

         }

-        

+

         return;

     }

--- a/src/strife/deh_strife.c

+++ b/src/strife/deh_strife.c

@@ -30,8 +30,8 @@

 char *deh_signatures[] =

 {

-    "Patch File for DeHackEd v2.3",

-    "Patch File for DeHackEd v3.0",

+    "Patch File for SeHackEd v0.4",

+    "Patch File for SeHackEd v0.3",

     NULL

 };

--- a/src/strife/deh_thing.c

+++ b/src/strife/deh_thing.c

@@ -48,6 +48,7 @@

   DEH_MAPPING("Pain sound",          painsound)

   DEH_MAPPING("Close attack frame",  meleestate)

   DEH_MAPPING("Far attack frame",    missilestate)

+  DEH_MAPPING("Crash frame",         crashstate)

   DEH_MAPPING("Death frame",         deathstate)

   DEH_MAPPING("Exploding frame",     xdeathstate)

   DEH_MAPPING("Death sound",         deathsound)

@@ -58,7 +59,7 @@

   DEH_MAPPING("Missile damage",      damage)

   DEH_MAPPING("Action sound",        activesound)

   DEH_MAPPING("Bits",                flags)

-  //DEH_MAPPING("Respawn frame",       raisestate)  // villsa [STRIFE] unused

+  DEH_UNSUPPORTED_MAPPING("Name pointer")

 DEH_END_MAPPING

 static void *DEH_ThingStart(deh_context_t *context, char *line)

--- a/src/strife/deh_weapon.c

+++ b/src/strife/deh_weapon.c

@@ -43,6 +43,7 @@

   DEH_MAPPING("Bobbing frame",    readystate)

   DEH_MAPPING("Shooting frame",   atkstate)

   DEH_MAPPING("Firing frame",     flashstate)

+  DEH_UNSUPPORTED_MAPPING("? Unknown")

 DEH_END_MAPPING

 static void *DEH_WeaponStart(deh_context_t *context, char *line)