Rename the generic wzapp_c.h to wzapp.h.

The _c was a leftover from the good old days, when this was written in C and everyone used RFC 1149.

lib/framework/Makefile.am

@@ -54,7 +54,7 @@ noinst_HEADERS = \
 	endian_hack.h \
 	gettext.h \
 	macros.h \
-	wzapp_c.h \
+	wzapp.h \
 	wzfs.h \
 	wzglobal.h
 

lib/framework/debug.cpp

@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <time.h>
 #include "string_ext.h"
-#include "lib/framework/wzapp_c.h"
+#include "wzapp.h"
 #include "lib/gamelib/gtime.h"
 
 #ifdef WZ_OS_LINUX

lib/framework/frame.cpp

@@ -28,7 +28,7 @@
  */
 #include "frame.h"
 #include "file.h"
-#include "wzapp_c.h"
+#include "wzapp.h"
 
 #include <physfs.h>
 

lib/gamelib/gtime.cpp

@@ -25,7 +25,7 @@
  */
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "gtime.h"
 #include "src/multiplay.h"
 #include "lib/netplay/netplay.h"

lib/ivis_opengl/piemode.cpp

@@ -28,7 +28,7 @@
 
 #include "lib/framework/frame.h"
 #include "lib/framework/opengl.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #include "lib/ivis_opengl/piedef.h"
 #include "lib/ivis_opengl/piestate.h"

lib/netplay/netplay.cpp

@@ -24,7 +24,7 @@
  */
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/string_ext.h"
 #include "lib/framework/crc.h"
 #include "lib/framework/file.h"

lib/netplay/netsocket.cpp

@@ -24,11 +24,9 @@
  */
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "netsocket.h"
 
-#include "lib/framework/wzapp_c.h"
-
 #include <vector>
 #include <algorithm>
 #include <map>

lib/qtgame/wzapp_qt.cpp

@@ -42,7 +42,7 @@
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/ivis_opengl/pieclip.h"
 #include "lib/ivis_opengl/screen.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "src/main.h"
 #include "src/configuration.h"
 #include "lib/gamelib/gtime.h"

lib/widget/editbox.cpp

@@ -27,7 +27,7 @@
 
 #include "lib/framework/frame.h"
 #include "lib/framework/utf.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "widget.h"
 #include "widgint.h"
 #include "editbox.h"

lib/widget/tip.cpp

@@ -22,7 +22,7 @@
  */
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/frameint.h"
 #include "widget.h"
 #include "widgint.h"

src/configuration.cpp

@@ -24,7 +24,7 @@
  */
 
 #include <QtCore/QSettings>
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/framework/input.h"
 #include "lib/netplay/netplay.h"

src/display.cpp

@@ -30,7 +30,7 @@
 #include "lib/framework/strres.h"
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/framework/fixedpoint.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #include "action.h"
 #include "display.h"

src/effects.cpp

@@ -35,7 +35,7 @@
 	* STILL NEED TO REMOVE SOME MAGIC NUMBERS INTO #DEFINES!!! *
 	************************************************************
 */
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/framework/frameresource.h"
 #include "lib/framework/input.h"

src/fpath.cpp

@@ -28,7 +28,7 @@
 #include "lib/framework/crc.h"
 #include "lib/netplay/netplay.h"
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #include "objects.h"
 #include "map.h"

src/frontend.cpp

@@ -24,7 +24,7 @@
  * Alex Lee. Pumpkin Studios. Eidos PLC 98,
  */
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #if defined(WZ_OS_WIN)
 #  include <shellapi.h> /* For ShellExecute  */

src/game.cpp

@@ -17,7 +17,7 @@
 	along with Warzone 2100; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include <QtCore/QMap>
 
 /* Standard library headers */

src/ingameop.cpp

@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/strres.h"
 #include "lib/widget/widget.h"
 #include "lib/netplay/netplay.h"

src/init.cpp

@@ -32,7 +32,7 @@
 #include "lib/framework/file.h"
 #include "lib/framework/physfs_ext.h"
 #include "lib/framework/strres.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/ivis_opengl/piemode.h"
 #include "lib/ivis_opengl/piestate.h"
 #include "lib/ivis_opengl/tex.h"

src/keybind.cpp

@@ -23,7 +23,7 @@
 #include "lib/framework/strres.h"
 #include "lib/framework/stdio_ext.h"
 #include "lib/framework/utf.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "objects.h"
 #include "basedef.h"
 #include "map.h"

src/loop.cpp

@@ -26,7 +26,7 @@
 #include "lib/framework/frame.h"
 #include "lib/framework/input.h"
 #include "lib/framework/strres.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #include "lib/ivis_opengl/pieblitfunc.h"
 #include "lib/ivis_opengl/piestate.h" //ivis render code

src/main.cpp

@@ -22,7 +22,7 @@
  */
 
 // Get platform defines before checking for them!
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include <QtCore/QTextCodec>
 #include <QtGui/QApplication>
 #include <QtGui/QMessageBox>
@@ -37,7 +37,6 @@
 #include "lib/framework/input.h"
 #include "lib/framework/frameint.h"
 #include "lib/framework/physfs_ext.h"
-#include "lib/framework/wzapp_c.h"
 #include "lib/exceptionhandler/exceptionhandler.h"
 #include "lib/exceptionhandler/dumpinfo.h"
 #include "lib/framework/wzfs.h"

src/map.cpp

@@ -50,7 +50,7 @@
 #include "fpath.h"
 #include "levels.h"
 #include "scriptfuncs.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #define GAME_TICKS_FOR_DANGER (GAME_TICKS_PER_SEC * 2)
 

src/mission.cpp

@@ -25,7 +25,7 @@
 #include "mission.h"
 
 #include "lib/framework/frame.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/math_ext.h"
 #include "lib/ivis_opengl/bitimage.h"
 #include "lib/ivis_opengl/textdraw.h"

src/multiint.cpp

@@ -26,7 +26,7 @@
  */
 
 #include "lib/framework/frame.h"		// LEAVE THIS ALONE, it *must* be first for compiler specific fixes.
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 
 #include <time.h>

src/multiopt.cpp

@@ -54,15 +54,8 @@
 #include "multirecv.h"
 #include "scriptfuncs.h"
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
-// ////////////////////////////////////////////////////////////////////////////
-// External Variables
-
-extern char	buildTime[8];
-
-// ////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////
 
 // send complete game info set!
 void sendOptions()

src/qtscript.cpp

@@ -34,7 +34,7 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/framework/file.h"
 #include "lib/gamelib/gtime.h"

src/qtscriptfuncs.cpp

@@ -22,7 +22,7 @@
  * New scripting system -- script functions
  */
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/sound/audio.h"
 #include "lib/netplay/netplay.h"

src/scores.cpp

@@ -27,7 +27,7 @@
 #include <string.h>
 
 // --------------------------------------------------------------------
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/framework/math_ext.h"
 #include "lib/framework/strres.h"

src/scriptfuncs.cpp

@@ -24,7 +24,7 @@
  *
  */
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/strres.h"
 #include "lib/framework/stdio_ext.h"
 #include "lib/widget/widget.h"

src/scriptobj.cpp

@@ -25,7 +25,7 @@
  */
 #include <string.h>
 
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 #include "lib/framework/wzconfig.h"
 #include "lib/framework/endian_hack.h"
 #include "lib/framework/strres.h"

src/wrappers.cpp

@@ -32,7 +32,7 @@
 #include "lib/ivis_opengl/screen.h"
 #include "lib/netplay/netplay.h"	// multiplayer
 #include "lib/sound/audio.h"
-#include "lib/framework/wzapp_c.h"
+#include "lib/framework/wzapp.h"
 
 #include "frontend.h"
 #include "keyedit.h"