Merge branch 'master' into GLSL-master

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...

CMakeLists.txt

@@ -110,33 +110,41 @@ endif()
 # Various compile flags
 add_definitions(-msse2)
 
+include(CheckCXXCompilerFlag)
+macro(check_and_add_flag var flag)
+	CHECK_CXX_COMPILER_FLAG(${flag} FLAG_${var})
+	if(FLAG_${var})
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+	endif()
+endmacro()
+
 # Enabling all warnings in MSVC spams too much
 if(NOT MSVC)
 	add_definitions(-Wall)
+
+	# TODO: would like these but they produce overwhelming amounts of warnings
+	#check_and_add_flag(EXTRA -Wextra)
+	#check_and_add_flag(MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers)
+	#check_and_add_flag(SWITCH_DEFAULT -Wswitch-default)
+	#check_and_add_flag(FLOAT_EQUAL -Wfloat-equal)
+	#check_and_add_flag(CONVERSION -Wconversion)
+	#check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant)
+	check_and_add_flag(TYPE_LIMITS -Wtype-limits)
+	check_and_add_flag(SIGN_COMPARE -Wsign-compare)
+	check_and_add_flag(IGNORED_QUALIFIERS -Wignored-qualifiers)
+	check_and_add_flag(UNINITIALIZED -Wuninitialized)
+	check_and_add_flag(LOGICAL_OP -Wlogical-op)
+	check_and_add_flag(SHADOW -Wshadow)
+	check_and_add_flag(INIT_SELF -Winit-self)
 endif(NOT MSVC)
 
 # gcc uses some optimizations which might break stuff without this flag
-add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi)
+add_definitions(-fno-strict-aliasing -fno-exceptions)
 
-include(CheckCXXCompilerFlag)
-
-# We call fread numerous times without checking return values.  Hide the
-# corresponding compiler warnings if the compiler supports doing so.
-CHECK_CXX_COMPILER_FLAG(-Wunused-result NO_UNUSED_RESULT)
-if(NO_UNUSED_RESULT)
-	add_definitions(-Wno-unused-result)
-endif(NO_UNUSED_RESULT)
-
-CHECK_CXX_COMPILER_FLAG(-fvisibility-inlines-hidden VISIBILITY_INLINES_HIDDEN)
-if(VISIBILITY_INLINES_HIDDEN)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-endif(VISIBILITY_INLINES_HIDDEN)
+check_and_add_flag(VISIBILITY_INLINES_HIDDEN -fvisibility-inlines-hidden)
 
 if(UNIX AND NOT APPLE)
-	CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden VISIBILITY_HIDDEN)
-	if(VISIBILITY_HIDDEN)
-		add_definitions(-fvisibility=hidden)
-	endif(VISIBILITY_HIDDEN)
+	check_and_add_flag(VISIBILITY_HIDDEN -fvisibility=hidden)
 endif()
 
 if(APPLE)

Data/User/GameConfig/G2TE52.ini

@@ -1,7 +1,16 @@
 # G2TE52 - Tony Hawk's Underground 2
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/G3AP69.ini

@@ -1,4 +1,4 @@
-# G3AE69 - The Lord of the Rings, The Third Age
+# G3AP69 - The Lord of the Rings, The Third Age
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.

Data/User/GameConfig/GAZD69.ini

@@ -0,0 +1,16 @@
+# GAZD69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZE69.ini

@@ -1,7 +1,16 @@
 # GAZE69 - Harry Potter : POA
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZF69.ini

@@ -0,0 +1,16 @@
+# GAZF69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZH69.ini

@@ -0,0 +1,16 @@
+# GAZH69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZI69.ini

@@ -0,0 +1,16 @@
+# GAZI69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZJ69.ini

@@ -0,0 +1,16 @@
+# GAZJ69 - Harry Potter to Azkaban no Shuujin
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZM69.ini

@@ -0,0 +1,16 @@
+# GAZM69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZP69.ini

@@ -0,0 +1,16 @@
+# GAZP69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GAZS69.ini

@@ -0,0 +1,16 @@
+# GAZS69 - Harry Potter : POA
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4D69.ini

@@ -0,0 +1,16 @@
+# GH4D69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4E69.ini

@@ -1,7 +1,16 @@
-# GH4E69 - Goblet Of Fire
+# GH4E69 - Harry Potter and the Goblet of Fire
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4F69.ini

@@ -0,0 +1,16 @@
+# GH4F69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4H69.ini

@@ -0,0 +1,16 @@
+# GH4H69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4I69.ini

@@ -0,0 +1,16 @@
+# GH4I69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4J69.ini

@@ -0,0 +1,16 @@
+# GH4J69 - Harry Potter to Honoo no Goblet
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4M69.ini

@@ -0,0 +1,16 @@
+# GH4M69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4P69.ini

@@ -0,0 +1,16 @@
+# GH4P69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GH4S69.ini

@@ -0,0 +1,16 @@
+# GH4S69 - Harry Potter and the Goblet of Fire
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLE69.ini

@@ -1,7 +1,16 @@
 # GHLE69 - Harry Potter and the Sorcerer's Stone
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Missing text sometimes
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLJ69.ini

@@ -0,0 +1,16 @@
+# GHLJ69 - Harry Potter to Kenja no Ishi
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLP69.ini

@@ -0,0 +1,16 @@
+# GHLP69 - Harry Potter and the Philosopher's Stone
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLX69.ini

@@ -0,0 +1,16 @@
+# GHLX69 - Harry Potter and the Sorcerer's Stone
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLY69.ini

@@ -0,0 +1,16 @@
+# GHLY69 - Harry Potter and the Sorcerer's Stone
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHLZ69.ini

@@ -0,0 +1,16 @@
+# GHLZ69 - Harry Potter and the Sorcerer's Stone
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Text missing in D3D9, use D3D11 or Opengl instead.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GHSE69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = HLE sound glitches, videos require real XFB
+EmulationIssues = Needs Real Xfb for videos to display.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GHSJ69.ini

@@ -0,0 +1,18 @@
+# GHSJ69 - Harry Potter to Himitsu no Heya
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GHSP69.ini

@@ -0,0 +1,18 @@
+# GHSP69 - Harry Potter: Chamber Of Secrets
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GHSX69.ini

@@ -0,0 +1,18 @@
+# GHSX69 - Harry Potter: Chamber Of Secrets
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GHSY69.ini

@@ -2,7 +2,7 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = HLE sound glitches, videos require real XFB
+EmulationIssues = Needs Real Xfb for videos to display.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GKYE01.ini

@@ -6,5 +6,12 @@ EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/GKYJ01.ini

@@ -0,0 +1,17 @@
+# GKYJ01 - Kirby Air Ride
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 5
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/GKYP01.ini

@@ -1,6 +1,17 @@
 # GKYP01 - Kirby Air Ride
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 4
+EmulationStateId = 5
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/GM8E01.ini

@@ -38,7 +38,6 @@ $Have Wave Beam
 $Have Plasma Beam
 4200183C 00230001
 $Have Phazon Beam
-01165C8D 08000000
 70458245 00000080
 087A55A9 000000C5
 00458245 0000007C
@@ -100,4 +99,3 @@ SafeTextureCacheColorSamples = 512
 [Video_Hacks]
 EFBCopyEnable = True
 EFBToTextureEnable = False
-[Video_Enhancements]

Data/User/GameConfig/GQWE69.ini

@@ -1,7 +1,16 @@
 # GQWE69 - Quidditch World Cup
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Black screen
-EmulationStateId = 1
+EmulationIssues = 
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GQWJ69.ini

@@ -0,0 +1,16 @@
+# GQWJ69 - Quidditch World Cup
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GQWP69.ini

@@ -0,0 +1,16 @@
+# GQWP69 - Quidditch World Cup
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GQWX69.ini

@@ -0,0 +1,16 @@
+# GQWX69 - Quidditch World Cup
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

Data/User/GameConfig/GSSE8P.ini

@@ -1,8 +1,8 @@
 # GSSE8P - Sega Soccer Slam
 [Core] Values set here will override the main dolphin settings.
-TLBHack = 0
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 $Master Code
@@ -19,3 +19,14 @@ $SubZero Have Tons Of Cash
 0423C204 05F5E0FF
 $Volta Have Tons Of Cash
 0423CEA8 05F5E0FF
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSJ8P.ini

@@ -0,0 +1,18 @@
+# GSSJ8P - Sega Soccer Slam
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSP70.ini

@@ -0,0 +1,18 @@
+# GSSP70 - Sega Soccer Slam
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GSSP8P.ini

@@ -0,0 +1,18 @@
+# GSSP8P - Sega Soccer Slam
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = Needs real xfb for the videos to display.
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GUME52.ini

@@ -2,8 +2,8 @@
 [Core] Values set here will override the main dolphin settings.
 MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though.
-EmulationStateId = 2
+EmulationIssues = Needs MMU to run, and it runs slow.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GUMP52.ini

@@ -2,8 +2,8 @@
 [Core] Values set here will override the main dolphin settings.
 MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs MMU to run, it gives a black screen after the intro video though.
-EmulationStateId = 2
+EmulationIssues = Needs MMU to run, and it runs slow.
+EmulationStateId = 3
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/GZPE70.ini

@@ -0,0 +1,18 @@
+# GZPE70 - Zapper
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/GZPP70.ini

@@ -0,0 +1,18 @@
+# GZPP70 - Zapper
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/PH_PRESETS.ini

@@ -33,8 +33,7 @@ PH_ExtraParam = 1
 
 [5]
 Title = Tales of Symphonia GC
-PH_ZNear = 0.5
-PH_ZFar = 1
+PH_ZNear = 0.0002
 
 
 # ---------------------------------------------------

Data/User/GameConfig/R2GEXJ.ini

@@ -1,7 +1,7 @@
 # R2GEXJ - FRAGILE DREAMS
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+EmulationIssues = Minimap needs emulate format changes to work.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -18,3 +18,4 @@ UseXFB = True
 UseRealXFB = False
 [Video_Hacks]
 DlistCachingEnable = False
+EFBEmulateFormatChanges = True

Data/User/GameConfig/R2GJAF.ini

@@ -1,7 +1,7 @@
 # R2GJAF - FRAGILE
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+EmulationIssues = Minimap needs emulate format changes to work.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -16,6 +16,6 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
-[Video_Enhancements]
 [Video_Hacks]
 DlistCachingEnable = False
+EFBEmulateFormatChanges = True

Data/User/GameConfig/R2GP99.ini

@@ -1,7 +1,7 @@
 # R2GP99 - FRAGILE DREAMS
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = 
+EmulationIssues = Minimap needs emulate format changes to work.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
@@ -18,4 +18,4 @@ UseXFB = True
 UseRealXFB = False
 [Video_Hacks]
 DlistCachingEnable = False
-
+EFBEmulateFormatChanges = True

Data/User/GameConfig/R3ME01.ini

@@ -1,10 +1,20 @@
 # R3ME01 - Metroid Prime Trilogy
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]
+DisableWiimoteSpeaker = 1

Data/User/GameConfig/R3MP01.ini

@@ -0,0 +1,20 @@
+# R3MP01 - Metroid Prime Trilogy
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBToTextureEnable = False
+EFBCopyEnable = True
+[Wii]
+DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWE01.ini

@@ -14,3 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Enhancements]
+[Wii]
+DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWJ01.ini

@@ -14,3 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Enhancements]
+[Wii]
+DisableWiimoteSpeaker = 1

Data/User/GameConfig/RBWP01.ini

@@ -14,3 +14,5 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Video_Enhancements]
+[Wii]
+DisableWiimoteSpeaker = 1

Data/User/GameConfig/RH8E4F.ini

@@ -0,0 +1,18 @@
+# RH8E4F - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/RH8JEL.ini

@@ -0,0 +1,18 @@
+# RH8JEL - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/RH8P4F.ini

@@ -1,9 +1,18 @@
-# RH8P4F - Tomb Raider Eight
+# RH8P4F - Tomb Raider Underworld
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = 
+EmulationIssues = Needs real Xfb for the videos to display.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/RH8X4F.ini

@@ -0,0 +1,18 @@
+# RH8X4F - Tomb Raider Underworld
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real Xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True

Data/User/GameConfig/RHDE8P.ini

@@ -1,8 +1,8 @@
 # RHDE8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Only Hotd 3 works. XFB is needed for dx9.
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RHDJ8P.ini

@@ -1,8 +1,8 @@
 # RHDJ8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Only Hotd 3 works. XFB is needed for dx9.
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RHDP8P.ini

@@ -1,8 +1,8 @@
 # RHDP8P - THE HOUSE OF THE DEAD 2 AND 3 RETURN
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = Only Hotd 3 works. XFB is needed for dx9.
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]

Data/User/GameConfig/RS5EC8.ini

@@ -0,0 +1,17 @@
+# RS5EC8 - SAMURAI WARRIORS KATANA
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/RS5JC8.ini

@@ -0,0 +1,17 @@
+# RS5JC8 - Sengoku Musou KATANA
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/RS5PC8.ini

@@ -0,0 +1,17 @@
+# RS5PC8 - SAMURAI WARRIORS KATANA
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Hacks]
+EFBEmulateFormatChanges = True

Data/User/GameConfig/SX3J01.ini

@@ -15,3 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 
+SafeTextureCacheColorSamples = 0
+[Wii]

Data/User/GameConfig/SX3P01.ini

@@ -15,3 +15,5 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 
+SafeTextureCacheColorSamples = 0
+[Wii]

Languages/gettextize

@@ -7,7 +7,11 @@ CPP_FILE_LIST=$(find $SRCDIR \( -name '*.cpp' -o -name '*.h' -o -name '*.c' \) \
 xgettext -d dolphin-emu -s --keyword=_ --keyword=wxTRANSLATE --keyword=SuccessAlertT	\
 	--keyword=PanicAlertT --keyword=PanicYesNoT --keyword=AskYesNoT --keyword=_trans	\
 	--keyword=CriticalAlertT --add-comments=i18n -p ./Languages/po -o dolphin-emu.pot	\
-	$CPP_FILE_LIST --package-name="Dolphin Emu"
+	$CPP_FILE_LIST --package-name="Dolphin Emulator"
+
+sed -i "s/SOME DESCRIPTIVE TITLE\./Translation of dolphin-emu.pot to LANGUAGE/" Languages/po/dolphin-emu.pot
+sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2003-2013/" Languages/po/dolphin-emu.pot
+sed -i "s/license as the PACKAGE package/license as the dolphin-emu package/" Languages/po/dolphin-emu.pot
 
 POTFILE=./Languages/po/dolphin-emu.pot
 PO_FILES=$(find ./Languages/po -name '*.po')

Source/Core/AudioCommon/Src/DPL2Decoder.cpp

@@ -232,70 +232,70 @@ float passive_lock(float x)
 
 void matrix_decode(const float *in, const int k, const int il,
 	const int ir, bool decode_rear,
-	const int dlbuflen,
-	float l_fwr, float r_fwr,
-	float lpr_fwr, float lmr_fwr,
-	float *adapt_l_gain, float *adapt_r_gain,
-	float *adapt_lpr_gain, float *adapt_lmr_gain,
-	float *lf, float *rf, float *lr,
-	float *rr, float *cf)
+	const int _dlbuflen,
+	float _l_fwr, float _r_fwr,
+	float _lpr_fwr, float _lmr_fwr,
+	float *_adapt_l_gain, float *_adapt_r_gain,
+	float *_adapt_lpr_gain, float *_adapt_lmr_gain,
+	float *_lf, float *_rf, float *_lr,
+	float *_rr, float *_cf)
 {
 	static const float M9_03DB = 0.3535533906f;
 	static const float MATAGCTRIG = 8.0f;  /* (Fuzzy) AGC trigger */
 	static const float MATAGCDECAY = 1.0f; /* AGC baseline decay rate (1/samp.) */
 	static const float MATCOMPGAIN = 0.37f; /* Cross talk compensation gain,  0.50 - 0.55 is full cancellation. */
 
-	const int kr = (k + olddelay) % dlbuflen;
-	float l_gain = (l_fwr + r_fwr) / (1 + l_fwr + l_fwr);
-	float r_gain = (l_fwr + r_fwr) / (1 + r_fwr + r_fwr);
+	const int kr = (k + olddelay) % _dlbuflen;
+	float l_gain = (_l_fwr + _r_fwr) / (1 + _l_fwr + _l_fwr);
+	float r_gain = (_l_fwr + _r_fwr) / (1 + _r_fwr + _r_fwr);
 	/* The 2nd axis has strong gain fluctuations, and therefore require
 	limits.  The factor corresponds to the 1 / amplification of (Lt
 	- Rt) when (Lt, Rt) is strongly correlated. (e.g. during
 	dialogues).  It should be bigger than -12 dB to prevent
 	distortion. */
-	float lmr_lim_fwr = lmr_fwr > M9_03DB * lpr_fwr ? lmr_fwr : M9_03DB * lpr_fwr;
-	float lpr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lpr_fwr + lpr_fwr);
-	float lmr_gain = (lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr);
-	float lmr_unlim_gain = (lpr_fwr + lmr_fwr) / (1 + lmr_fwr + lmr_fwr);
+	float lmr_lim_fwr = _lmr_fwr > M9_03DB * _lpr_fwr ? _lmr_fwr : M9_03DB * _lpr_fwr;
+	float lpr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + _lpr_fwr + _lpr_fwr);
+	float lmr_gain = (_lpr_fwr + lmr_lim_fwr) / (1 + lmr_lim_fwr + lmr_lim_fwr);
+	float lmr_unlim_gain = (_lpr_fwr + _lmr_fwr) / (1 + _lmr_fwr + _lmr_fwr);
 	float lpr, lmr;
 	float l_agc, r_agc, lpr_agc, lmr_agc;
 	float f, d_gain, c_gain, c_agc_cfk;
 
 	/*** AXIS NO. 1: (Lt, Rt) -> (C, Ls, Rs) ***/
 	/* AGC adaption */
-	d_gain = (fabs(l_gain - *adapt_l_gain) + fabs(r_gain - *adapt_r_gain)) * 0.5f;
+	d_gain = (fabs(l_gain - *_adapt_l_gain) + fabs(r_gain - *_adapt_r_gain)) * 0.5f;
 	f = d_gain * (1.0f / MATAGCTRIG);
 	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
-	*adapt_l_gain = (1 - f) * *adapt_l_gain + f * l_gain;
-	*adapt_r_gain = (1 - f) * *adapt_r_gain + f * r_gain;
+	*_adapt_l_gain = (1 - f) * *_adapt_l_gain + f * l_gain;
+	*_adapt_r_gain = (1 - f) * *_adapt_r_gain + f * r_gain;
 	/* Matrix */
-	l_agc = in[il] * passive_lock(*adapt_l_gain);
-	r_agc = in[ir] * passive_lock(*adapt_r_gain);
-	cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2;
+	l_agc = in[il] * passive_lock(*_adapt_l_gain);
+	r_agc = in[ir] * passive_lock(*_adapt_r_gain);
+	_cf[k] = (l_agc + r_agc) * (float)M_SQRT1_2;
 	if (decode_rear)
 	{
-		lr[kr] = rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2;
+		_lr[kr] = _rr[kr] = (l_agc - r_agc) * (float)M_SQRT1_2;
 		/* Stereo rear channel is steered with the same AGC steering as
 		the decoding matrix. Note this requires a fast updating AGC
 		at the order of 20 ms (which is the case here). */
-		lr[kr] *= (l_fwr + l_fwr) / (1 + l_fwr + r_fwr);
-		rr[kr] *= (r_fwr + r_fwr) / (1 + l_fwr + r_fwr);
+		_lr[kr] *= (_l_fwr + _l_fwr) / (1 + _l_fwr + _r_fwr);
+		_rr[kr] *= (_r_fwr + _r_fwr) / (1 + _l_fwr + _r_fwr);
 	}
 
 	/*** AXIS NO. 2: (Lt + Rt, Lt - Rt) -> (L, R) ***/
 	lpr = (in[il] + in[ir]) * (float)M_SQRT1_2;
 	lmr = (in[il] - in[ir]) * (float)M_SQRT1_2;
 	/* AGC adaption */
-	d_gain = fabs(lmr_unlim_gain - *adapt_lmr_gain);
+	d_gain = fabs(lmr_unlim_gain - *_adapt_lmr_gain);
 	f = d_gain * (1.0f / MATAGCTRIG);
 	f = MATAGCDECAY - MATAGCDECAY / (1 + f * f);
-	*adapt_lpr_gain = (1 - f) * *adapt_lpr_gain + f * lpr_gain;
-	*adapt_lmr_gain = (1 - f) * *adapt_lmr_gain + f * lmr_gain;
+	*_adapt_lpr_gain = (1 - f) * *_adapt_lpr_gain + f * lpr_gain;
+	*_adapt_lmr_gain = (1 - f) * *_adapt_lmr_gain + f * lmr_gain;
 	/* Matrix */
-	lpr_agc = lpr * passive_lock(*adapt_lpr_gain);
-	lmr_agc = lmr * passive_lock(*adapt_lmr_gain);
-	lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2;
-	rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2;
+	lpr_agc = lpr * passive_lock(*_adapt_lpr_gain);
+	lmr_agc = lmr * passive_lock(*_adapt_lmr_gain);
+	_lf[k] = (lpr_agc + lmr_agc) * (float)M_SQRT1_2;
+	_rf[k] = (lpr_agc - lmr_agc) * (float)M_SQRT1_2;
 
 	/*** CENTER FRONT CANCELLATION ***/
 	/* A heuristic approach exploits that Lt + Rt gain contains the
@@ -303,16 +303,16 @@ void matrix_decode(const float *in, const int k, const int il,
 	the front and rear "cones" to concentrate Lt + Rt to C and
 	introduce Lt - Rt in L, R. */
 	/* 0.67677 is the empirical lower bound for lpr_gain. */
-	c_gain = 8 * (*adapt_lpr_gain - 0.67677f);
+	c_gain = 8 * (*_adapt_lpr_gain - 0.67677f);
 	c_gain = c_gain > 0 ? c_gain : 0;
 	/* c_gain should not be too high, not even reaching full
 	cancellation (~ 0.50 - 0.55 at current AGC implementation), or
 	the center will sound too narrow. */
 	c_gain = MATCOMPGAIN / (1 + c_gain * c_gain);
-	c_agc_cfk = c_gain * cf[k];
-	lf[k] -= c_agc_cfk;
-	rf[k] -= c_agc_cfk;
-	cf[k] += c_agc_cfk + c_agc_cfk;
+	c_agc_cfk = c_gain * _cf[k];
+	_lf[k] -= c_agc_cfk;
+	_rf[k] -= c_agc_cfk;
+	_cf[k] += c_agc_cfk + c_agc_cfk;
 }
 
 void dpl2decode(float *samples, int numsamples, float *out)

Source/Core/AudioCommon/Src/Mixer.h

@@ -92,7 +92,7 @@ public:
 
 	std::mutex& MixerCritical() { return m_csMixing; }
 
-	volatile float GetCurrentSpeed() const { return m_speed; }
+	float GetCurrentSpeed() const { return m_speed; }
 	void UpdateSpeed(volatile float val) { m_speed = val; }
 
 protected:

Source/Core/AudioCommon/Src/OpenALStream.cpp

@@ -316,7 +316,7 @@ void OpenALStream::SoundLoop()
 				if (iBuffersFilled == numBuffers)
 				{
 					alSourcePlay(uiSource);
-					ALenum err = alGetError();
+					err = alGetError();
 					if (err != 0)
 					{
 						ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err);
@@ -328,7 +328,7 @@ void OpenALStream::SoundLoop()
 				{
 					// Buffer underrun occurred, resume playback
 					alSourcePlay(uiSource);
-					ALenum err = alGetError();
+					err = alGetError();
 					if (err != 0)
 					{
 						ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err);

Source/Core/Common/Src/CPUDetect.cpp

@@ -205,14 +205,7 @@ void CPUInfo::Detect()
 // Turn the cpu info into a string we can show
 std::string CPUInfo::Summarize()
 {
-	std::string sum;
-	if (num_cores == 1)
-		sum = StringFromFormat("%s, %i core", cpu_string, num_cores);
-	else
-	{
-		sum = StringFromFormat("%s, %i cores", cpu_string, num_cores);
-		if (HTT) sum += StringFromFormat(" (%i logical threads per physical core)", logical_cpu_count);
-	}
+	std::string sum(cpu_string);
 	if (bSSE) sum += ", SSE";
 	if (bSSE2) sum += ", SSE2";
 	if (bSSE3) sum += ", SSE3";

Source/Core/Common/Src/FileUtil.cpp

@@ -42,6 +42,7 @@
 #endif
 
 #include <fstream>
+#include <algorithm>
 #include <sys/stat.h>
 
 #ifndef S_ISDIR
@@ -196,8 +197,9 @@ bool CreateFullPath(const std::string &fullPath)
 		// we're done, yay!
 		if (position == fullPath.npos)
 			return true;
-			
-		std::string subPath = fullPath.substr(0, position);
+		
+		// Include the '/' so the first call is CreateDir("/") rather than CreateDir("")
+		std::string const subPath(fullPath.substr(0, position + 1));
 		if (!File::IsDirectory(subPath))
 			File::CreateDir(subPath);
 
@@ -773,6 +775,24 @@ IOFile::~IOFile()
 	Close();
 }
 
+IOFile::IOFile(IOFile&& other)
+	: m_file(NULL), m_good(true)
+{
+	Swap(other);
+}
+
+IOFile& IOFile::operator=(IOFile other)
+{
+	Swap(other);
+	return *this;
+}
+
+void IOFile::Swap(IOFile& other)
+{
+	std::swap(m_file, other.m_file);
+	std::swap(m_good, other.m_good);
+}
+
 bool IOFile::Open(const std::string& filename, const char openmode[])
 {
 	Close();