From 6a92bc54be4081c8821ca110947133b5f1f8516b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Feb 2010 03:04:29 +0000
Subject: Initial code for HHE patch support.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1858
---
 src/heretic/deh_weapon.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 src/heretic/deh_weapon.c

(limited to 'src/heretic/deh_weapon.c')

diff --git a/src/heretic/deh_weapon.c b/src/heretic/deh_weapon.c
new file mode 100644
index 00000000..1daae766
--- /dev/null
+++ b/src/heretic/deh_weapon.c
@@ -0,0 +1,130 @@
+// Emacs style mode select   -*- C++ -*- 
+//-----------------------------------------------------------------------------
+//
+// Copyright(C) 2005 Simon Howard
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+//
+//-----------------------------------------------------------------------------
+//
+// Parses "Weapon" sections in dehacked files
+//
+//-----------------------------------------------------------------------------
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "doomtype.h"
+
+#include "doomdef.h"
+
+#include "deh_defs.h"
+#include "deh_main.h"
+#include "deh_mapping.h"
+#include "deh_htic.h"
+
+DEH_BEGIN_MAPPING(weapon_mapping, weaponinfo_t)
+  DEH_MAPPING("Ammo type",        ammo)
+  DEH_MAPPING("Deselect frame",   upstate)
+  DEH_MAPPING("Select frame",     downstate)
+  DEH_MAPPING("Bobbing frame",    readystate)
+  DEH_MAPPING("Shooting frame",   atkstate)
+  DEH_MAPPING("Firing frame",     holdatkstate)
+  DEH_MAPPING("Unknown frame",    flashstate)
+DEH_END_MAPPING
+
+static void *DEH_WeaponStart(deh_context_t *context, char *line)
+{
+    int weapon_number = 0;
+
+    if (sscanf(line, "Weapon %i", &weapon_number) != 1)
+    {
+        DEH_Warning(context, "Parse error on section start");
+        return NULL;
+    }
+
+    if (weapon_number < 0 || weapon_number >= NUMWEAPONS * 2)
+    {
+        DEH_Warning(context, "Invalid weapon number: %i", weapon_number);
+        return NULL;
+    }
+
+    // Because of the tome of power, we have two levels of weapons:
+
+    if (weapon_number < NUMWEAPONS)
+    {
+        return &wpnlev1info[weapon_number];
+    }
+    else
+    {
+        return &wpnlev2info[weapon_number - NUMWEAPONS];
+    }
+}
+
+static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
+{
+    char *variable_name, *value;
+    weaponinfo_t *weapon;
+    int ivalue;
+
+    if (tag == NULL)
+        return;
+
+    weapon = (weaponinfo_t *) tag;
+
+    if (!DEH_ParseAssignment(line, &variable_name, &value))
+    {
+        // Failed to parse
+
+        DEH_Warning(context, "Failed to parse assignment");
+        return;
+    }
+
+    ivalue = atoi(value);
+
+    // If this is a frame field, we need to map from Heretic 1.0 frame
+    // numbers to Heretic 1.3 frame numbers.
+
+    if (strstr(variable_name, "frame") != NULL)
+    {
+        ivalue = DEH_MapHereticFrameNumber(ivalue);
+    }
+
+    DEH_SetMapping(context, &weapon_mapping, weapon, variable_name, ivalue);
+}
+
+static void DEH_WeaponMD5Sum(md5_context_t *context)
+{
+    int i;
+
+    for (i=0; i<NUMWEAPONS ;++i)
+    {
+        DEH_StructMD5Sum(context, &weapon_mapping, &wpnlev1info[i]);
+        DEH_StructMD5Sum(context, &weapon_mapping, &wpnlev2info[i]);
+    }
+}
+
+deh_section_t deh_section_weapon =
+{
+    "Weapon",
+    NULL,
+    DEH_WeaponStart,
+    DEH_WeaponParseLine,
+    NULL,
+    DEH_WeaponMD5Sum,
+};
+
-- 
cgit v1.2.3


From 26bafb10f03213a97a0628359265ec865f73fba5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 8 Feb 2010 19:12:23 +0000
Subject: Add case-insensitive version of strstr(), and use this instead of
 strstr() in dehacked code to determine when to map frame numbers.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1861
---
 src/heretic/deh_weapon.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/heretic/deh_weapon.c')

diff --git a/src/heretic/deh_weapon.c b/src/heretic/deh_weapon.c
index 1daae766..28a90c68 100644
--- a/src/heretic/deh_weapon.c
+++ b/src/heretic/deh_weapon.c
@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include "doomtype.h"
+#include "m_misc.h"
 
 #include "doomdef.h"
 
@@ -99,7 +100,7 @@ static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
     // If this is a frame field, we need to map from Heretic 1.0 frame
     // numbers to Heretic 1.3 frame numbers.
 
-    if (strstr(variable_name, "frame") != NULL)
+    if (M_StrCaseStr(variable_name, "frame") != NULL)
     {
         ivalue = DEH_MapHereticFrameNumber(ivalue);
     }
-- 
cgit v1.2.3