misc changes, make sure where using the 2010 toolchain

death-droid · Oct 15, 2012 · 56e3dc0 · 56e3dc0
1 parent 5711df9
commit 56e3dc0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/Config.cpp b/Config.cpp
@@ -89,7 +89,6 @@ const SettingInfo ForceTextureFilterSettings[] =
 	"N64 Default Texture Filter",	FORCE_DEFAULT_FILTER,
 	"Force Nearest Filter (faster, low quality)",	FORCE_POINT_FILTER,
 	"Force Linear Filter (slower, better quality)",	FORCE_LINEAR_FILTER,
-
 };
 
 const SettingInfo TextureEnhancementSettings[] =

diff --git a/Parser/RSP_Parser.cpp b/Parser/RSP_Parser.cpp
@@ -965,10 +965,10 @@ void RSP_GFX_InitGeometryMode()
 {
 	bool bCullFront		= (gRDP.geometryMode & G_CULL_FRONT) ? true : false;
 	bool bCullBack		= (gRDP.geometryMode & G_CULL_BACK) ? true : false;
+
 	if( bCullFront && bCullBack ) // should never cull front
-	{
 		bCullFront = false;
-	}
+
 	CRender::g_pRender->SetCullMode(bCullFront, bCullBack);
 
 	BOOL bShade			= (gRDP.geometryMode & G_SHADE) ? TRUE : FALSE;
@@ -1095,13 +1095,9 @@ void DLParser_RDPSetOtherMode(Gfx *gfx)
 	uint16 blender = gRDP.otherMode.blender;
 	RDP_BlenderSetting &bl = *(RDP_BlenderSetting*)(&(blender));
 	if( bl.c1_m1a==3 || bl.c1_m2a == 3 || bl.c2_m1a == 3 || bl.c2_m2a == 3 )
-	{
 		gRDP.bFogEnableInBlender = true;
-	}
 	else
-	{
 		gRDP.bFogEnableInBlender = false;
-	}
 }
 
 

diff --git a/RiceVideo.vcxproj b/RiceVideo.vcxproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>