commit 38945b0d2590e9f4d7291f047e9ab855b4baa3f2
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Sep 8 18:29:33 2010 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Wed Sep 8 18:29:33 2010 +0000
Update dehacked field names for beginnings of SeHacked support.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2046
---
src/strife/deh_cheat.c | 26 +++++++++++++-------------
src/strife/deh_frame.c | 4 +---
src/strife/deh_misc.c | 8 ++++----
src/strife/deh_strife.c | 4 ++--
src/strife/deh_thing.c | 3 ++-
src/strife/deh_weapon.c | 1 +
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/strife/deh_cheat.c b/src/strife/deh_cheat.c
index 8817c56e..c693a2df 100644
--- a/src/strife/deh_cheat.c
+++ b/src/strife/deh_cheat.c
@@ -44,22 +44,22 @@ typedef struct
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)
diff --git a/src/strife/deh_frame.c b/src/strife/deh_frame.c
index d2fc3b3c..9383b94f 100644
--- a/src/strife/deh_frame.c
+++ b/src/strife/deh_frame.c
@@ -41,9 +41,7 @@ DEH_BEGIN_MAPPING(state_mapping, state_t)
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)
diff --git a/src/strife/deh_misc.c b/src/strife/deh_misc.c
index b57d0ef0..e3f2606c 100644
--- a/src/strife/deh_misc.c
+++ b/src/strife/deh_misc.c
@@ -148,8 +148,8 @@ static struct
{"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 @@ static struct
{"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 @@ static void DEH_MiscParseLine(deh_context_t *context, char *line, void *tag)
DEH_Warning(context,
"Invalid value for 'Monsters Infight': %i", ivalue);
}
-
+
return;
}
diff --git a/src/strife/deh_strife.c b/src/strife/deh_strife.c
index c9a7a73b..bda411c0 100644
--- 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
};
diff --git a/src/strife/deh_thing.c b/src/strife/deh_thing.c
index 694411dc..14b23b0a 100644
--- a/src/strife/deh_thing.c
+++ b/src/strife/deh_thing.c
@@ -48,6 +48,7 @@ DEH_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
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_BEGIN_MAPPING(thing_mapping, mobjinfo_t)
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)
diff --git a/src/strife/deh_weapon.c b/src/strife/deh_weapon.c
index b0c2400c..8e89b93e 100644
--- a/src/strife/deh_weapon.c
+++ b/src/strife/deh_weapon.c
@@ -43,6 +43,7 @@ DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
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)