From 6c1daa914b029bcf8fcbbb5bb22af4b376982f5d Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Fri, 26 Feb 2016 01:03:12 -0800
Subject: [PATCH] SDL, GB Video: Fix some warnings

---
 src/gb/renderers/software.c  |  2 +-
 src/platform/sdl/main.c      | 28 +++++++++++++---------------
 src/platform/sdl/sdl-audio.c |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/gb/renderers/software.c b/src/gb/renderers/software.c
index e84507a88..980ca8b4a 100644
--- a/src/gb/renderers/software.c
+++ b/src/gb/renderers/software.c
@@ -297,7 +297,7 @@ static void GBVideoSoftwareRendererDrawObj(struct GBVideoSoftwareRenderer* rende
 	if (GBRegisterLCDCIsObjSize(renderer->lcdc) && obj->tile & 1) {
 		--tileOffset;
 	}
-	uint8_t mask = GBObjAttributesIsPriority(obj->attr) ? ~0x1C : ~0x9F;
+	uint8_t mask = GBObjAttributesIsPriority(obj->attr) ? 0xE3 : 0x60;
 	uint8_t mask2 = GBObjAttributesIsPriority(obj->attr) ? 0 : 0x83;
 	int p;
 	if (renderer->model >= GB_MODEL_CGB) {
diff --git a/src/platform/sdl/main.c b/src/platform/sdl/main.c
index 42f8c383d..3a669838c 100644
--- a/src/platform/sdl/main.c
+++ b/src/platform/sdl/main.c
@@ -75,22 +75,20 @@ int main(int argc, char** argv) {
 		return 0;
 	}
 
-	if (args.fname) {
-		renderer.core = mCoreFind(args.fname);
-		if (!renderer.core) {
-			printf("Could not run game. Are you sure the file exists and is a compatible game?\n");
-			freeArguments(&args);
-			return 1;
-		}
-		renderer.core->desiredVideoDimensions(renderer.core, &renderer.width, &renderer.height);
-#ifdef BUILD_GL
-		mSDLGLCreate(&renderer);
-#elif defined(BUILD_GLES2) || defined(USE_EPOXY)
-		mSDLGLES2Create(&renderer);
-#else
-		mSDLSWCreate(&renderer);
-#endif
+	renderer.core = mCoreFind(args.fname);
+	if (!renderer.core) {
+		printf("Could not run game. Are you sure the file exists and is a compatible game?\n");
+		freeArguments(&args);
+		return 1;
 	}
+	renderer.core->desiredVideoDimensions(renderer.core, &renderer.width, &renderer.height);
+#ifdef BUILD_GL
+	mSDLGLCreate(&renderer);
+#elif defined(BUILD_GLES2) || defined(USE_EPOXY)
+	mSDLGLES2Create(&renderer);
+#else
+	mSDLSWCreate(&renderer);
+#endif
 
 	renderer.ratio = graphicsOpts.multiplier;
 	if (renderer.ratio == 0) {
diff --git a/src/platform/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c
index ff41211b7..913fc99a1 100644
--- a/src/platform/sdl/sdl-audio.c
+++ b/src/platform/sdl/sdl-audio.c
@@ -93,7 +93,7 @@ static void _mSDLAudioCallback(void* context, Uint8* data, int len) {
 	}
 	blip_t* left = NULL;
 	blip_t* right = NULL;
-	int32_t clockRate;
+	int32_t clockRate = GBA_ARM7TDMI_FREQUENCY;
 	if (audioContext->core) {
 		left = audioContext->core->getAudioChannel(audioContext->core, 0);
 		right = audioContext->core->getAudioChannel(audioContext->core, 1);