commit 27901a5b8a8536ff0c236c96f24970a09821fc31
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Oct 3 11:08:16 2005 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Oct 3 11:08:16 2005 +0000
Replace end of section functions with NULLs as they arent currently being
used for anything.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 157
---
src/deh_ammo.c | 12 ++++++------
src/deh_frame.c | 12 ++++++------
src/deh_main.c | 12 ++++++++++--
src/deh_ptr.c | 12 ++++++------
src/deh_text.c | 12 ++++++------
src/deh_thing.c | 12 ++++++------
src/deh_weapon.c | 12 ++++++------
7 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/src/deh_ammo.c b/src/deh_ammo.c
index fe626a4a..5ebcb76a 100644
--- a/src/deh_ammo.c
+++ b/src/deh_ammo.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_ammo.c 153 2005-10-02 23:49:01Z fraggle $
+// $Id: deh_ammo.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.2 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.1 2005/10/02 23:49:01 fraggle
// The beginnings of dehacked support
//
@@ -40,10 +44,6 @@ static void *DEH_AmmoStart(deh_context_t *context, char *line)
return NULL;
}
-static void DEH_AmmoEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_AmmoParseLine(deh_context_t *context, char *line, void *tag)
{
}
@@ -54,6 +54,6 @@ deh_section_t deh_section_ammo =
NULL,
DEH_AmmoStart,
DEH_AmmoParseLine,
- DEH_AmmoEnd,
+ NULL,
};
diff --git a/src/deh_frame.c b/src/deh_frame.c
index 4cf7eeff..5140ef42 100644
--- a/src/deh_frame.c
+++ b/src/deh_frame.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_frame.c 155 2005-10-03 10:25:37Z fraggle $
+// $Id: deh_frame.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.4 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.3 2005/10/03 10:25:37 fraggle
// Add mapping code to map out structures and switch thing/frame code to use
// this.
@@ -72,10 +76,6 @@ static void *DEH_FrameStart(deh_context_t *context, char *line)
return state;
}
-static void DEH_FrameEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_FrameParseLine(deh_context_t *context, char *line, void *tag)
{
state_t *state;
@@ -113,6 +113,6 @@ deh_section_t deh_section_frame =
NULL,
DEH_FrameStart,
DEH_FrameParseLine,
- DEH_FrameEnd,
+ NULL,
};
diff --git a/src/deh_main.c b/src/deh_main.c
index 22391785..2c773de7 100644
--- a/src/deh_main.c
+++ b/src/deh_main.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_main.c 153 2005-10-02 23:49:01Z fraggle $
+// $Id: deh_main.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.2 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.1 2005/10/02 23:49:01 fraggle
// The beginnings of dehacked support
//
@@ -201,7 +205,11 @@ static void DEH_ParseContext(deh_context_t *context)
{
// end of section
- current_section->end(context, tag);
+ if (current_section->end != NULL)
+ {
+ current_section->end(context, tag);
+ }
+
//printf("end %s tag\n", current_section->name);
current_section = NULL;
}
diff --git a/src/deh_ptr.c b/src/deh_ptr.c
index fb6b0ce6..a7c41ba7 100644
--- a/src/deh_ptr.c
+++ b/src/deh_ptr.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_ptr.c 154 2005-10-03 00:42:45Z fraggle $
+// $Id: deh_ptr.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.2 2005/10/03 00:42:45 fraggle
// Frame numbers are indexed from 0
//
@@ -71,10 +75,6 @@ static void *DEH_PointerStart(deh_context_t *context, char *line)
return &states[frame_number];
}
-static void DEH_PointerEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_PointerParseLine(deh_context_t *context, char *line, void *tag)
{
state_t *state;
@@ -128,6 +128,6 @@ deh_section_t deh_section_pointer =
DEH_PointerInit,
DEH_PointerStart,
DEH_PointerParseLine,
- DEH_PointerEnd,
+ NULL,
};
diff --git a/src/deh_text.c b/src/deh_text.c
index ae50d5bf..45b1d839 100644
--- a/src/deh_text.c
+++ b/src/deh_text.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_text.c 153 2005-10-02 23:49:01Z fraggle $
+// $Id: deh_text.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.2 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.1 2005/10/02 23:49:01 fraggle
// The beginnings of dehacked support
//
@@ -40,10 +44,6 @@ static void *DEH_TextStart(deh_context_t *context, char *line)
return NULL;
}
-static void DEH_TextEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_TextParseLine(deh_context_t *context, char *line, void *tag)
{
}
@@ -54,6 +54,6 @@ deh_section_t deh_section_text =
NULL,
DEH_TextStart,
DEH_TextParseLine,
- DEH_TextEnd,
+ NULL,
};
diff --git a/src/deh_thing.c b/src/deh_thing.c
index 4f4d6754..a57b9ff0 100644
--- a/src/deh_thing.c
+++ b/src/deh_thing.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_thing.c 155 2005-10-03 10:25:37Z fraggle $
+// $Id: deh_thing.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.2 2005/10/03 10:25:37 fraggle
// Add mapping code to map out structures and switch thing/frame code to use
// this.
@@ -90,10 +94,6 @@ static void *DEH_ThingStart(deh_context_t *context, char *line)
return mobj;
}
-static void DEH_ThingEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_ThingParseLine(deh_context_t *context, char *line, void *tag)
{
mobjinfo_t *mobj;
@@ -131,6 +131,6 @@ deh_section_t deh_section_thing =
NULL,
DEH_ThingStart,
DEH_ThingParseLine,
- DEH_ThingEnd,
+ NULL,
};
diff --git a/src/deh_weapon.c b/src/deh_weapon.c
index 7cc3eb5c..d1db4ba6 100644
--- a/src/deh_weapon.c
+++ b/src/deh_weapon.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_weapon.c 156 2005-10-03 11:02:08Z fraggle $
+// $Id: deh_weapon.c 157 2005-10-03 11:08:16Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2005/10/03 11:08:16 fraggle
+// Replace end of section functions with NULLs as they arent currently being
+// used for anything.
+//
// Revision 1.2 2005/10/03 11:02:08 fraggle
// Add a weaponinfo_t mapping
//
@@ -56,10 +60,6 @@ static void *DEH_WeaponStart(deh_context_t *context, char *line)
return NULL;
}
-static void DEH_WeaponEnd(deh_context_t *context, void *tag)
-{
-}
-
static void DEH_WeaponParseLine(deh_context_t *context, char *line, void *tag)
{
}
@@ -70,6 +70,6 @@ deh_section_t deh_section_weapon =
NULL,
DEH_WeaponStart,
DEH_WeaponParseLine,
- DEH_WeaponEnd,
+ NULL,
};