No deprecated-writable-strings warnings any more!

src/GLString.cpp

@@ -172,7 +172,7 @@ void GLString::setActive(unsigned int string, bool active)
 }
 
 
-void GLString::SetString(unsigned int string, char *s, ...)
+void GLString::SetString(unsigned int string, const char *s, ...)
 {
 	va_list args;
 	gl_string_t *str;

src/GLString.h

@@ -118,7 +118,7 @@ class GLString
 
 	void setActive(unsigned int string, bool active);
 
-	void SetString(unsigned int string, char *s, ...);
+	void SetString(unsigned int string, const char *s, ...);
    /*------------------------------------------------------
     * Pre  : String is valid gl_string id
 	 *        Args form the string to fill String buffer

src/OpenRaider.cpp

@@ -235,14 +235,14 @@ void percent_callback(int p)
 }
 
 
-void openraider_warning(char *func_name, char *warning,
-								char *filename, int line)
+void openraider_warning(const char *func_name, const char *warning,
+								const char *filename, int line)
 {
 	printf("%s> WARNING %s %s:%i\n", func_name, warning, filename, line);
 }
 
-void openraider_error(char *func_name, char *error,
-							 char *filename, int line)
+void openraider_error(const char *func_name, const char *error,
+							 const char *filename, int line)
 {
 	printf("%s> ERROR %s %s:%i\n", func_name, error, filename, line);
 }
@@ -800,7 +800,7 @@ void OpenRaider::handleKeyPressEvent(unsigned int key, unsigned int mod)
 }
 
 
-void OpenRaider::print(bool dump_stdout, char *format, ...)
+void OpenRaider::print(bool dump_stdout, const char *format, ...)
 {
 	static char buffer[128];
 	va_list args;

src/OpenRaider.h

@@ -226,7 +226,7 @@ class OpenRaider : public SDLSystem
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
-	void print(bool dump_stdout, char *format, ...);
+	void print(bool dump_stdout, const char *format, ...);
 	/*------------------------------------------------------
 	 * Pre  : Use like printf
 	 *

src/Render.cpp

@@ -199,7 +199,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
 {
 	char filename[128];
 	bool fastCard = mFlags & Render::fFastCard;
-	char *console = "Toggle the Console with [`] key, Menu with <esc>";
+	const char *console = "Toggle the Console with [`] key, Menu with <esc>";
 	int font_id;
 	int snow1_id;
 	int snow2_id;
@@ -383,7 +383,7 @@ void Render::loadMd3(char *model, char *skin)
 }
 
 
-void Render::initEmitter(char *name, unsigned int size,
+void Render::initEmitter(const char *name, unsigned int size,
 								 unsigned int snowTex1, unsigned int snowTex2)
 {
 #ifdef USING_EMITTER

src/Render.h

@@ -242,7 +242,7 @@ class Render
 	 * Mongoose - Created, factored out of UnRaider class
 	 ------------------------------------------------------*/
 
-	void initEmitter(char *name, unsigned int size,
+	void initEmitter(const char *name, unsigned int size,
 						  unsigned int snowTex1, unsigned int snowTex2);
 	/*------------------------------------------------------
 	 * Pre  : Textures are init and these args are valid

src/SDLSystem.cpp

@@ -158,7 +158,7 @@ unsigned int SDLSystem::getTicks()
 ////////////////////////////////////////////////////////////
 
 #ifdef FIXME
-void SDLSystem::bindKeyCommand(char *cmd, int key, int event)
+void SDLSystem::bindKeyCommand(const char *cmd, int key, int event)
 {
 	if (key > 255)
 	{

src/SDLSystem.h

@@ -1,19 +1,19 @@
 /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
 /*================================================================
- * 
+ *
  * Project : OpenRaider
  * Author  : Terry 'Mongoose' Hendrix II
  * Website : http://www.westga.edu/~stu7440/
  * Email   : stu7440@westga.edu
  * Object  : SDLSystem
  * License : No use w/o permission (C) 2002 Mongoose
- * Comments: 
+ * Comments:
  *
  *
- *           This file was generated using Mongoose's C++ 
+ *           This file was generated using Mongoose's C++
  *           template generator script.  <stu7440@westga.edu>
- * 
- *-- History ------------------------------------------------ 
+ *
+ *-- History ------------------------------------------------
  *
  * 2002.06.06:
  * Mongoose - Created
@@ -41,12 +41,12 @@ class SDLSystem : public System
 
 	SDLSystem();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Constructs an object of SDLSystem
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -57,7 +57,7 @@ class SDLSystem : public System
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -68,13 +68,13 @@ class SDLSystem : public System
 
 	virtual unsigned int getTicks();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Returns number of milliseconds since start of
 	 *        program
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -83,13 +83,13 @@ class SDLSystem : public System
 	// Public Mutators
 	////////////////////////////////////////////////////////////
 
-	//FIXME: void bindKeyCommand(char *cmd, int key, int event);
+	//FIXME: void bindKeyCommand(const char *cmd, int key, int event);
 	/*------------------------------------------------------
 	 * Pre  : <Cmd> is a valid command string
 	 *        <Key> is a valid keyboard code
 	 *        <Event> is a valid game event Id
 	 *
-	 * Post : Sets <Event> binding <Cmd> to <Key> press 
+	 * Post : Sets <Event> binding <Cmd> to <Key> press
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -101,7 +101,7 @@ class SDLSystem : public System
    /*------------------------------------------------------
     * Pre  : <X>, and <Y> are valid world coordinates
 	 *        <String> is a valid string
-	 *     
+	 *
 	 *        Requires glEnterMode2d() call before entry
 	 *
 	 *        System::bufferString(..) can cache printf()
@@ -117,7 +117,7 @@ class SDLSystem : public System
 	 * 2003.06.03:
 	 * Mongoose - Ported to SDL_TTF
 	 *
-    * 2001.12.31: 
+    * 2001.12.31:
     * Mongoose - Created
     ------------------------------------------------------*/
 
@@ -136,11 +136,11 @@ class SDLSystem : public System
 	 * 2003.06.03:
 	 * Mongoose - Ported to SDL_TTF
 	 *
-    * 2001.12.31: 
+    * 2001.12.31:
     * Mongoose - Created
     ------------------------------------------------------*/
 
-	void initVideo(unsigned int width, unsigned int height, 
+	void initVideo(unsigned int width, unsigned int height,
 						bool fullscreen);
 	/*------------------------------------------------------
 	 * Pre  : Video mode request <Width> x <Height>
@@ -150,36 +150,36 @@ class SDLSystem : public System
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	void resize(unsigned int width, unsigned int height);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Resizes game window
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created, from old SDLUnitTest code
 	 ------------------------------------------------------*/
 
 	void runGame();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Start game loop
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	void setGrabMouse(bool on);
 	/*------------------------------------------------------
-	 * Pre  : 
-	 * Post : 
+	 * Pre  :
+	 * Post :
 	 *
 	 *-- History ------------------------------------------
 	 *
@@ -189,34 +189,34 @@ class SDLSystem : public System
 
 	void shutdown(int i);
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Shutsdown the game subsystems, exits game loop
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	void swapBuffersGL();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Swaps OpenGL buufers ( call at end of frame )
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
 	void toggleFullscreen();
 	/*------------------------------------------------------
-	 * Pre  : 
+	 * Pre  :
 	 * Post : Toggle fullscreen windowing mode
 	 *
 	 *-- History ------------------------------------------
 	 *
-	 * 2002.06.06: 
+	 * 2002.06.06:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
@@ -231,7 +231,7 @@ class SDLSystem : public System
 	////////////////////////////////////////////////////////////
 	// Private Mutators
 	////////////////////////////////////////////////////////////
-	
+
 	SDL_Surface *mWindow;	/* This is the pointer to the SDL surface */
 };
 #endif

src/System.cpp

@@ -101,7 +101,7 @@ System::~System()
 // Public Accessors
 ////////////////////////////////////////////////////////////
 
-char *System::bufferString(char *string, ...)
+char *System::bufferString(const char *string, ...)
 {
 	int sz = 60;
 	int n;
@@ -155,7 +155,7 @@ char *System::bufferString(char *string, ...)
 }
 
 
-char *System::fullPath(char *path, char end)
+char *System::fullPath(const char *path, char end)
 {
 	unsigned int i, lenPath, lenEnv, len;
 	char *env, *dir;
@@ -346,7 +346,7 @@ unsigned int System::addCommandMode(const char *command)
 }
 
 // FIXME: Modifer support later
-void System::bindKeyCommand(char *cmd, unsigned int key, int event)
+void System::bindKeyCommand(const char *cmd, unsigned int key, int event)
 {
 	printf("Bound command '%s' -> event %i (0x%x key)\n", cmd, event, key);
 	mKeyEvents.Add(key, event);
@@ -388,7 +388,7 @@ void System::command(const char *cmd)
 }
 
 
-int System::loadResourceFile(char *filename)
+int System::loadResourceFile(const char *filename)
 {
 	char buffer[256];
 	bool line_comment = false;

src/System.h

@@ -102,7 +102,7 @@ public:
 	// Public Accessors
 	////////////////////////////////////////////////////////////
 
-   static char *bufferString(char *string, ...);
+   static char *bufferString(const char *string, ...);
    /*------------------------------------------------------
     * Pre  : <String> is a valid string with valid args
 	 *
@@ -118,7 +118,7 @@ public:
     * Mongoose - Created, was GLString::glPrintf
     ------------------------------------------------------*/
 
-	static char *fullPath(char *path, char end);
+	static char *fullPath(const char *path, char end);
 	/*------------------------------------------------------
 	 * Pre  :
 	 * Post : Returns allocated string of path, with
@@ -210,7 +210,7 @@ public:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
-	virtual void bindKeyCommand(char *cmd, unsigned int key, int event);
+	virtual void bindKeyCommand(const char *cmd, unsigned int key, int event);
 	/*------------------------------------------------------
 	 * Pre  : <Cmd> is a valid command string
 	 *        <Key> is a valid keyboard code
@@ -354,7 +354,7 @@ public:
 	 * Mongoose - Created
 	 ------------------------------------------------------*/
 
-	virtual int loadResourceFile(char *filename);
+	virtual int loadResourceFile(const char *filename);
 	/*------------------------------------------------------
 	 * Pre  :
 	 * Post : Init the resource vars