From 42acd61ccbcfc9aff1368821b2c9d0f8cdc99ee3 Mon Sep 17 00:00:00 2001
From: comex <comexk@gmail.com>
Date: Thu, 11 Sep 2014 01:55:43 -0400
Subject: [PATCH] Fix warnings.

---
 Source/Core/Core/Core.cpp  | 10 +++-------
 Source/Core/Core/Movie.cpp | 14 +++++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 7e23619654..3a764a4e63 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -89,8 +89,6 @@ static bool s_request_refresh_info = false;
 static int s_pause_and_lock_depth = 0;
 static bool s_is_framelimiter_temp_disabled = false;
 
-SCoreStartupParameter g_CoreStartupParameter;
-
 bool GetIsFramelimiterTempDisabled()
 {
 	return s_is_framelimiter_temp_disabled;
@@ -179,12 +177,10 @@ bool Init()
 		s_emu_thread.join();
 	}
 
-	g_CoreStartupParameter = _CoreParameter;
-
 	INFO_LOG(OSREPORT, "Starting core = %s mode",
-		g_CoreStartupParameter.bWii ? "Wii" : "GameCube");
+		_CoreParameter.bWii ? "Wii" : "GameCube");
 	INFO_LOG(OSREPORT, "CPU Thread separate = %s",
-		g_CoreStartupParameter.bCPUThread ? "Yes" : "No");
+		_CoreParameter.bCPUThread ? "Yes" : "No");
 
 	Host_UpdateMainFrame(); // Disable any menus or buttons at boot
 
@@ -353,7 +349,7 @@ void EmuThread()
 
 	Pad::Initialize(s_window_handle);
 	// Load and Init Wiimotes - only if we are booting in wii mode
-	if (g_CoreStartupParameter.bWii)
+	if (_CoreParameter.bWii)
 	{
 		Wiimote::Initialize(s_window_handle, !s_state_filename.empty());
 
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index c8791a601f..78c5f07936 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -53,7 +53,7 @@ static size_t tmpInputAllocated = 0;
 static u64 s_currentByte = 0, s_totalBytes = 0;
 u64 g_currentFrame = 0, g_totalFrames = 0; // VI
 u64 g_currentLagCount = 0;
-u64 g_totalLagCount = 0; // just stats
+static u64 s_totalLagCount = 0; // just stats
 u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
 static u64 s_totalTickCount = 0, s_tickCountAtLastInput = 0; // just stats
 static u64 s_recordingStartTime; // seconds since 1970 that recording started
@@ -142,7 +142,7 @@ void FrameUpdate()
 	if (IsRecordingInput())
 	{
 		g_totalFrames = g_currentFrame;
-		g_totalLagCount = g_currentLagCount;
+		s_totalLagCount = g_currentLagCount;
 	}
 	if (s_bFrameStep)
 	{
@@ -440,7 +440,7 @@ bool BeginRecordingInput(int controllers)
 
 	s_numPads = controllers;
 	g_currentFrame = g_totalFrames = 0;
-	g_currentLagCount = g_totalLagCount = 0;
+	g_currentLagCount = s_totalLagCount = 0;
 	g_currentInputCount = g_totalInputCount = 0;
 	s_totalTickCount = s_tickCountAtLastInput = 0;
 	s_bongos = 0;
@@ -756,7 +756,7 @@ bool PlayInput(const std::string& filename)
 
 	ReadHeader();
 	g_totalFrames = tmpHeader.frameCount;
-	g_totalLagCount = tmpHeader.lagCount;
+	s_totalLagCount = tmpHeader.lagCount;
 	g_totalInputCount = tmpHeader.inputCount;
 	s_totalTickCount = tmpHeader.tickCount;
 	g_currentFrame = 0;
@@ -844,7 +844,7 @@ void LoadInput(const std::string& filename)
 	if (!s_bReadOnly || tmpInput == nullptr)
 	{
 		g_totalFrames = tmpHeader.frameCount;
-		g_totalLagCount = tmpHeader.lagCount;
+		s_totalLagCount = tmpHeader.lagCount;
 		g_totalInputCount = tmpHeader.inputCount;
 		s_totalTickCount = s_tickCountAtLastInput = tmpHeader.tickCount;
 
@@ -1018,7 +1018,7 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
 		Core::SetState(Core::CORE_PAUSE);
 		bool found = false;
 		std::string path;
-		for (int i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); ++i)
+		for (size_t i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); ++i)
 		{
 			path = SConfig::GetInstance().m_ISOFolder[i];
 			if (File::Exists(path + '/' + g_discChange))
@@ -1124,7 +1124,7 @@ void SaveRecording(const std::string& filename)
 
 	header.bFromSaveState = s_bRecordingFromSaveState;
 	header.frameCount = g_totalFrames;
-	header.lagCount = g_totalLagCount;
+	header.lagCount = s_totalLagCount;
 	header.inputCount = g_totalInputCount;
 	header.numRerecords = s_rerecords;
 	header.recordingStartTime = s_recordingStartTime;