Remove the last content of deliverance.h (#define MAX_STR_LENGTH 256) to wzglobal.h and remove it

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4219 4a71c877-e1ca-e34f-864e-861f7616d084

lib/framework/wzglobal.h

@@ -405,6 +405,10 @@
 #  define WZ_DECL_MAY_ALIAS
 #endif
 
+/* ---- Global constants ---- */
+
+#define	MAX_STR_LENGTH          256
+
 /* ---- Platform specific setup ---- */
 
 

src/Makefile.am

@@ -16,7 +16,7 @@ noinst_HEADERS = action.h advvis.h ai.h aiexperience.h anim_id.h \
 	astar.h atmos.h basedef.h bridge.h bucket3d.h \
 	projectiledef.h cheat.h clparse.h cluster.h cmddroid.h \
 	cmddroiddef.h combat.h component.h configuration.h console.h data.h \
-	deliverance.h design.h difficulty.h display.h display3d.h display3ddef.h \
+	design.h difficulty.h display.h display3d.h display3ddef.h \
 	displaydef.h drive.h droid.h droiddef.h e3demo.h edit3d.h effects.h \
 	environ.h feature.h featuredef.h formation.h formationdef.h fpath.h \
 	frend.h frontend.h function.h functiondef.h game.h gateway.h \

src/basedef.h

@@ -25,7 +25,6 @@
 #define __INCLUDED_BASEDEF_H__
 
 #include "lib/ivis_common/pievector.h"
-#include "deliverance.h"
 #include "displaydef.h"
 #include "statsdef.h"
 

src/deliverance.h

@@ -1,29 +0,0 @@
-/*
-	This file is part of Warzone 2100.
-	Copyright (C) 1999-2004  Eidos Interactive
-	Copyright (C) 2005-2007  Warzone Resurrection Project
-
-	Warzone 2100 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.
-
-	Warzone 2100 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 Warzone 2100; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-/** @file
- *  Global defines for the game
- */
-
-#ifndef __INCLUDED_SRC_DELIVERANCE_H__
-#define __INCLUDED_SRC_DELIVERANCE_H__
-
-#define	MAX_STR_LENGTH		256
-
-#endif // __INCLUDED_SRC_DELIVERANCE_H__

src/droiddef.h

@@ -27,7 +27,6 @@
 #include "lib/gamelib/animobj.h"
 
 #include "basedef.h"
-#include "deliverance.h"
 #include "movedef.h"
 #include "statsdef.h"
 #include "weapondef.h"

src/mechanics.c

@@ -33,7 +33,6 @@
 #include "projectile.h"
 #include "move.h"
 #include "message.h"
-#include "deliverance.h"
 #include "astar.h"
 #include "visibility.h"
 

src/message.h

@@ -26,7 +26,6 @@
 
 #include "structure.h"
 #include "messagedef.h"
-#include "deliverance.h"
 
 #define NO_AUDIO_MSG		-1
 

src/messagedef.h

@@ -24,7 +24,6 @@
 #ifndef __INCLUDED_MESSAGEDEF_H__
 #define __INCLUDED_MESSAGEDEF_H__
 
-#include "deliverance.h"
 #include "lib/ivis_common/pietypes.h"
 
 typedef enum _message_type

src/objmem.c

@@ -28,7 +28,6 @@
 #include "lib/framework/frame.h"
 #include "lib/sound/audio.h"
 #include "objects.h"
-#include "deliverance.h"
 #include "lib/gamelib/gtime.h"
 #include "hci.h"
 #include "map.h"

warzone2100.cbp

@@ -1534,12 +1534,6 @@
 			<Option target="DBGWindows" />
 			<Option target="NDBGWindows" />
 		</Unit>
-		<Unit filename="src/deliverance.h">
-			<Option target="DBGUnix" />
-			<Option target="NDBGUnix" />
-			<Option target="DBGWindows" />
-			<Option target="NDBGWindows" />
-		</Unit>
 		<Unit filename="src/design.c">
 			<Option compilerVar="CC" />
 			<Option target="DBGUnix" />

win32/Warzone2100.vcproj

@@ -755,10 +755,6 @@
 				RelativePath="..\src\data.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\deliverance.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\design.h"
 				>