- Forgot to add OSDConfig.h.

- Changed more C standard library headers to C++ versions.

Src/BlockFile.cpp

@@ -26,8 +26,8 @@
  * class.
  */
 
-#include <stdio.h>
+#include <cstdio>
-#include <string.h>
+#include <cstring>
 #include "Supermodel.h"
 
 

Src/CPU/PowerPC/PPCDisasm.cpp

@@ -29,10 +29,10 @@
  * not sure whether any other kinds of instructions need checking.
  */
 
-#include <stdio.h>
+#include <cstdio>
-#include <string.h>
+#include <cstring>
 #ifdef STANDALONE
-#include <stdlib.h>
+#include <cstdlib>
 #endif
 #include "Supermodel.h"
 

Src/CPU/PowerPC/ppc.cpp

@@ -28,7 +28,7 @@
 
 /* IBM/Motorola PowerPC 4xx/6xx Emulator */
 
-#include <string.h>	// memset()
+#include <cstring>	// memset()
 #include "Supermodel.h"
 #include "ppc.h"
 

Src/Games.cpp

@@ -33,7 +33,7 @@
 #include "Supermodel.h"
 
 
-const struct GameInfo	Model3GameList[] =
+const struct GameInfo	g_Model3GameList[] =
 {
 	// Sega Bass Fishing
 	{

Src/Games.h

@@ -91,7 +91,7 @@ struct GameInfo
  performance reasons (but the ROMs are not specified that way here).
 ******************************************************************************/
 
-extern const struct GameInfo Model3GameList[];
+extern const struct GameInfo g_Model3GameList[];
 
 
 #endif	// INCLUDED_GAMES_H

Src/Model3/53C810.cpp

@@ -48,7 +48,7 @@
  *
  */
 
-#include <string.h>
+#include <cstring>
 #include "Supermodel.h"
 
 

Src/Model3/MPC10x.cpp

@@ -66,7 +66,7 @@
  *   endian, pushing the responsibility onto the caller.
  */
 
-#include <string.h>
+#include <cstring>
 #include "Supermodel.h"
 
 

Src/Model3/TileGen.cpp

@@ -31,7 +31,7 @@
  *   manually reverse the data. This keeps with the convention for VRAM.
  */
 
-#include <string.h>
+#include <cstring>
 #include "Supermodel.h"
 
 

Src/OSD/SDL/Main.cpp

@@ -509,7 +509,7 @@ int Supermodel(const char *zipFile, CInputs *Inputs, CINIFile *CmdLine)
 	// Initialize and load ROMs
 	if (OKAY != Model3->Init())
 		return 1;
-	if (OKAY != Model3->LoadROMSet(Model3GameList, zipFile))
+	if (OKAY != Model3->LoadROMSet(g_Model3GameList, zipFile))
 		return 1;
 		
 	// Apply game-specific settings and then, lastly, command line settings
@@ -797,7 +797,7 @@ static int DisassembleCROM(const char *zipFile, UINT32 addr, unsigned n)
 	Map[1].ptr = &crom[0x800000];
 	
 	// Load ROM set
-	Game = LoadROMSetFromZIPFile(Map, Model3GameList, zipFile, FALSE);
+	Game = LoadROMSetFromZIPFile(Map, g_Model3GameList, zipFile, FALSE);
 	if (NULL == Game)
 		return ErrorLog("Failed to load ROM set.");	
 		
@@ -961,12 +961,12 @@ static void PrintGameList(void)
 	puts("");
 	puts("    ROM Set         Title");
 	puts("    -------         -----");
-	for (i = 0; Model3GameList[i].title != NULL; i++)
+	for (i = 0; g_Model3GameList[i].title != NULL; i++)
 	{
-		printf("    %s", Model3GameList[i].id);
+		printf("    %s", g_Model3GameList[i].id);
-		for (j = strlen(Model3GameList[i].id); j < 9; j++)	// pad for alignment (no game ID is more than 9 letters)
+		for (j = strlen(g_Model3GameList[i].id); j < 9; j++)	// pad for alignment (no game ID is more than 9 letters)
 			printf(" ");
-		printf("       %s\n", Model3GameList[i].title);
+		printf("       %s\n", g_Model3GameList[i].title);
 	}
 }
 

Src/OSD/SDL/OSDConfig.h

@@ -0,0 +1,102 @@
+/**
+ ** Supermodel
+ ** A Sega Model 3 Arcade Emulator.
+ ** Copyright 2011 Bart Trzynadlowski 
+ **
+ ** This file is part of Supermodel.
+ **
+ ** Supermodel 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 3 of the License, or (at your option)
+ ** any later version.
+ **
+ ** Supermodel 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 Supermodel.  If not, see <http://www.gnu.org/licenses/>.
+ **/
+ 
+/*
+ * OSDConfig.h
+ * 
+ * Header file defining the COSDConfig class: OSD configuration settings,
+ * inherited by CConfig.
+ */
+
+#ifndef INCLUDED_OSDCONFIG_H
+#define INCLUDED_OSDCONFIG_H
+
+
+#include <string>
+#include "Supermodel.h"
+using namespace std;
+
+
+/*
+ * COSDConfig:
+ *
+ * Settings used by COSDConfig.
+ */
+class COSDConfig
+{
+public:
+	unsigned	xRes, yRes;		// X and Y resolution, in pixels
+	bool 		fullScreen;		// Full screen mode (if TRUE)
+	bool 		throttle;		// 60 Hz frame limiting
+	bool		showFPS;		// Show frame rate
+
+#ifdef SUPERMODEL_DEBUGGER
+	bool		disableDebugger;	// disables the debugger (not stored in the config. file)
+#endif
+	
+	// Input system
+	inline void SetInputSystem(const char *inpSysName)
+	{
+		if (inpSysName == NULL)
+		{
+			inputSystem = "sdl";
+			return;
+		}
+		
+		if (stricmp(inpSysName,"sdl") 
+#ifdef SUPERMODEL_WIN32
+			&& stricmp(inpSysName,"dinput") && stricmp(inpSysName,"xinput") && stricmp(inpSysName,"rawinput")
+#endif
+			)
+		{
+			ErrorLog("Unknown input system (%s), defaulting to SDL.", inpSysName);
+			inputSystem = "sdl";
+			return;
+		}
+		
+		inputSystem = inpSysName;
+	}
+	
+	inline const char *GetInputSystem(void)
+	{
+		return inputSystem.c_str();
+	}
+		
+	// Defaults
+	COSDConfig(void)
+	{
+		xRes = 496;
+		yRes = 384;
+		fullScreen = false;
+		throttle = true;
+		showFPS = false;
+#ifdef SUPERMODEL_DEBUGGER
+		disableDebugger = false;
+#endif
+		inputSystem = "sdl";
+	}
+	
+private:
+	string	inputSystem;
+};
+
+
+#endif	// INCLUDED_OSDCONFIG_H

Src/ROMLoad.cpp

@@ -26,7 +26,7 @@
  */
  
 #include <new>
-#include <string.h>
+#include <cstring>
 #include "Supermodel.h"
 #include "Pkgs/unzip.h"