Refactor: Moved AnimDefsParser() to libcommon

skyjake · Jan 25, 2014 · 50fbb64 · 50fbb64
1 parent a5a96c2
commit 50fbb64
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/doomsday/plugins/common/common.pri b/doomsday/plugins/common/common.pri
@@ -10,6 +10,7 @@ INCLUDEPATH += \
 
 HEADERS += \
     $$common_inc/am_map.h \
+    $$common_inc/animdefsparser.h \
     $$common_inc/common.h \
     $$common_inc/d_net.h \
     $$common_inc/d_netcl.h \
@@ -68,6 +69,7 @@ HEADERS += \
 
 SOURCES += \
     $$common_src/am_map.c \
+    $$common_src/animdefsparser.cpp \
     $$common_src/common.c \
     $$common_src/d_net.c \
     $$common_src/d_netcl.c \

diff --git a/doomsday/plugins/hexen/include/p_anim.h → ...y/plugins/common/include/animdefsparser.h b/doomsday/plugins/hexen/include/p_anim.h → ...y/plugins/common/include/animdefsparser.h
@@ -1,4 +1,4 @@
-/** @file p_anim.h  Parser for Hexen ANIMDEFS.
+/** @file animdefsparser.h  Parser for Hexen ANIMDEFS.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>

diff --git a/doomsday/plugins/hexen/src/p_anim.cpp → ...day/plugins/common/src/animdefsparser.cpp b/doomsday/plugins/hexen/src/p_anim.cpp → ...day/plugins/common/src/animdefsparser.cpp
@@ -1,4 +1,4 @@
-/** @file p_anim.cpp  Parser for Hexen ANIMDEFS.
+/** @file animdefsparser.cpp  Parser for Hexen ANIMDEFS.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -19,8 +19,8 @@
  * 02110-1301 USA</small>
  */
 
-#include "jhexen.h"
-#include "p_anim.h"
+#include "common.h"
+#include "animdefsparser.h"
 
 #include "hexlex.h"
 #include "p_mapsetup.h"

diff --git a/doomsday/plugins/hexen/hexen.pro b/doomsday/plugins/hexen/hexen.pro
@@ -41,7 +41,6 @@ HEADERS += \
     include/m_cheat.h \
     include/m_random.h \
     include/p_acs.h \
-    include/p_anim.h \
     include/p_enemy.h \
     include/p_inter.h \
     include/p_lights.h \
@@ -84,7 +83,6 @@ SOURCES += \
     src/m_cheat.c \
     src/m_random.c \
     src/p_acs.c \
-    src/p_anim.cpp \
     src/p_enemy.c \
     src/p_inter.c \
     src/p_lights.c \

diff --git a/doomsday/plugins/hexen/include/jhexen.h b/doomsday/plugins/hexen/include/jhexen.h
@@ -39,7 +39,6 @@
 #include "../../hexen/include/m_cheat.h"
 #include "../../hexen/include/m_random.h"
 #include "../../hexen/include/p_acs.h"
-#include "../../hexen/include/p_anim.h"
 #include "../../hexen/include/p_enemy.h"
 #include "../../hexen/include/p_inter.h"
 #include "../../hexen/include/p_lights.h"

diff --git a/doomsday/plugins/hexen/src/p_spec.c b/doomsday/plugins/hexen/src/p_spec.c
@@ -30,7 +30,7 @@
 
 #include "dmu_lib.h"
 #include "g_common.h"
-#include "p_anim.h"
+#include "animdefsparser.h"
 #include "p_inventory.h"
 #include "p_player.h"
 #include "p_map.h"