From fb79186648498c516b845f411e1138ceab49d006 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Sun, 13 Nov 2005 03:55:24 +0000
Subject: [PATCH] Fixes for Win32 VC.net project.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@877 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 stella/src/cheat/CheatCodeDialog.cxx |  4 +++-
 stella/src/emucore/EventHandler.cxx  |  4 +++-
 stella/src/win32/Stella.vcproj       | 33 ++++++++++++++++++----------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/stella/src/cheat/CheatCodeDialog.cxx b/stella/src/cheat/CheatCodeDialog.cxx
index 573305ed4..a48d8ddba 100644
--- a/stella/src/cheat/CheatCodeDialog.cxx
+++ b/stella/src/cheat/CheatCodeDialog.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: CheatCodeDialog.cxx,v 1.1 2005-11-12 22:59:20 stephena Exp $
+// $Id: CheatCodeDialog.cxx,v 1.2 2005-11-13 03:55:24 stephena Exp $
 //
 //   Based on code from ScummVM - Scumm Interpreter
 //   Copyright (C) 2002-2004 The ScummVM project
@@ -79,6 +79,7 @@ void CheatCodeDialog::handleCommand(CommandSender* sender, int cmd,
   switch(cmd)
   {
     case kEditAcceptCmd:
+    {
       // cerr << myInput->getEditString() << endl;
       const Cheat* cheat = 
         instance()->cheat().add("DLG", myInput->getEditString(), true);
@@ -105,6 +106,7 @@ void CheatCodeDialog::handleCommand(CommandSender* sender, int cmd,
         Dialog::handleCommand(sender, cmd, data, 0);
       }
       break;
+    }
 
     case kEditCancelCmd:
       Dialog::handleCommand(sender, kCloseCmd, data, id);
diff --git a/stella/src/emucore/EventHandler.cxx b/stella/src/emucore/EventHandler.cxx
index 68fc646b4..1e9c69686 100644
--- a/stella/src/emucore/EventHandler.cxx
+++ b/stella/src/emucore/EventHandler.cxx
@@ -13,7 +13,7 @@
 // See the file "license" for information on usage and redistribution of
 // this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// $Id: EventHandler.cxx,v 1.111 2005-11-12 22:04:57 stephena Exp $
+// $Id: EventHandler.cxx,v 1.112 2005-11-13 03:55:24 stephena Exp $
 //============================================================================
 
 #include <algorithm>
@@ -728,9 +728,11 @@ void EventHandler::poll(uInt32 time)
 
               // Send axis events for the paddles
               case Controller::Paddles:
+              {
                 int resistance = (Int32) (1000000.0 * (32767 - value) / 65534);
                 handleEvent(SA_Axis[type-2][axis][2], resistance);
                 break;
+              }
 
               // Send events for the driving controllers
               case Controller::Driving:
diff --git a/stella/src/win32/Stella.vcproj b/stella/src/win32/Stella.vcproj
index 74e25de67..2b486002d 100755
--- a/stella/src/win32/Stella.vcproj
+++ b/stella/src/win32/Stella.vcproj
@@ -20,8 +20,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SNAPSHOT_SUPPORT;SOUND_SUPPORT"
+				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SNAPSHOT_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="2"
@@ -73,8 +73,8 @@ opengl32.lib"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32"
-				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SOUND_SUPPORT"
+				AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
+				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEVELOPER_SUPPORT;SNAPSHOT_SUPPORT;DISPLAY_OPENGL;TEXTURES_ARE_LOST;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
@@ -134,7 +134,7 @@ opengl32.lib"
 				RelativePath="..\debugger\gui\AudioWidget.cxx">
 			</File>
 			<File
-				RelativePath="..\common\BankRomCheat.cxx">
+				RelativePath="..\cheat\BankRomCheat.cxx">
 			</File>
 			<File
 				RelativePath="..\debugger\BinAndExpression.cxx">
@@ -224,16 +224,16 @@ opengl32.lib"
 				RelativePath="..\emucore\CartUA.cxx">
 			</File>
 			<File
-				RelativePath="..\common\Cheat.cxx">
+				RelativePath="..\cheat\CheatCodeDialog.cxx">
 			</File>
 			<File
-				RelativePath="..\gui\CheatCodeDialog.cxx">
+				RelativePath="..\cheat\CheatManager.cxx">
 			</File>
 			<File
 				RelativePath="..\gui\CheckListWidget.cxx">
 			</File>
 			<File
-				RelativePath="..\common\CheetahCheat.cxx">
+				RelativePath="..\cheat\CheetahCheat.cxx">
 			</File>
 			<File
 				RelativePath="..\debugger\gui\ColorWidget.cxx">
@@ -472,6 +472,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\emucore\PropsSet.cxx">
 			</File>
+			<File
+				RelativePath="..\cheat\RamCheat.cxx">
+			</File>
 			<File
 				RelativePath="..\debugger\RamDebug.cxx">
 			</File>
@@ -595,7 +598,7 @@ opengl32.lib"
 				RelativePath="..\debugger\gui\AudioWidget.hxx">
 			</File>
 			<File
-				RelativePath="..\common\BankRomCheat.hxx">
+				RelativePath="..\cheat\BankRomCheat.hxx">
 			</File>
 			<File
 				RelativePath="..\debugger\BinAndExpression.hxx">
@@ -688,16 +691,19 @@ opengl32.lib"
 				RelativePath="..\emucore\CartUA.hxx">
 			</File>
 			<File
-				RelativePath="..\common\Cheat.hxx">
+				RelativePath="..\cheat\Cheat.hxx">
 			</File>
 			<File
-				RelativePath="..\gui\CheatCodeDialog.hxx">
+				RelativePath="..\cheat\CheatCodeDialog.hxx">
+			</File>
+			<File
+				RelativePath="..\cheat\CheatManager.hxx">
 			</File>
 			<File
 				RelativePath="..\gui\CheckListWidget.hxx">
 			</File>
 			<File
-				RelativePath="..\common\CheetahCheat.hxx">
+				RelativePath="..\cheat\CheetahCheat.hxx">
 			</File>
 			<File
 				RelativePath="..\debugger\gui\ColorWidget.hxx">
@@ -948,6 +954,9 @@ opengl32.lib"
 			<File
 				RelativePath="..\emucore\PropsSet.hxx">
 			</File>
+			<File
+				RelativePath="..\cheat\RamCheat.hxx">
+			</File>
 			<File
 				RelativePath="..\debugger\RamDebug.hxx">
 			</File>