Max/mgba-ps3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDL, GB Video: Fix some warnings

Browse Source
This commit is contained in:
Jeffrey Pfau 2016-02-26 01:03:12 -08:00
parent 12f9dd1782
commit 6c1daa914b
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gb/renderers/software.c
View File

@ -297,7 +297,7 @@ static void GBVideoSoftwareRendererDrawObj(struct GBVideoSoftwareRenderer* rende
if (GBRegisterLCDCIsObjSize(renderer->lcdc) && obj->tile & 1) { if (GBRegisterLCDCIsObjSize(renderer->lcdc) && obj->tile & 1) {
--tileOffset; --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; uint8_t mask2 = GBObjAttributesIsPriority(obj->attr) ? 0 : 0x83;
int p; int p;
if (renderer->model >= GB_MODEL_CGB) { if (renderer->model >= GB_MODEL_CGB) {

28
src/platform/sdl/main.c
View File

@ -75,22 +75,20 @@ int main(int argc, char** argv) {
return 0; return 0;
} }
if (args.fname) { renderer.core = mCoreFind(args.fname);
renderer.core = mCoreFind(args.fname); if (!renderer.core) {
if (!renderer.core) { printf("Could not run game. Are you sure the file exists and is a compatible game?\n");
printf("Could not run game. Are you sure the file exists and is a compatible game?\n"); freeArguments(&args);
freeArguments(&args); return 1;
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->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; renderer.ratio = graphicsOpts.multiplier;
if (renderer.ratio == 0) { if (renderer.ratio == 0) {

2
src/platform/sdl/sdl-audio.c
View File

@ -93,7 +93,7 @@ static void _mSDLAudioCallback(void* context, Uint8* data, int len) {
} }
blip_t* left = NULL; blip_t* left = NULL;
blip_t* right = NULL; blip_t* right = NULL;
int32_t clockRate; int32_t clockRate = GBA_ARM7TDMI_FREQUENCY;
if (audioContext->core) { if (audioContext->core) {
left = audioContext->core->getAudioChannel(audioContext->core, 0); left = audioContext->core->getAudioChannel(audioContext->core, 0);
right = audioContext->core->getAudioChannel(audioContext->core, 1); right = audioContext->core->getAudioChannel(audioContext->core, 1);