From 851ef0d7fb2b6f7eafecb37577ffc808503249f3 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Sun, 22 Jun 2008 22:06:14 +0000 Subject: [PATCH] fixed build errors on sdl --- src/drivers/sdl/input.cpp | 13 +++++++++---- src/utils/xstring.h | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index 58dcffc0..279479c7 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -29,6 +29,7 @@ #include "../common/cheat.h" #include "../../movie.h" #include "../../fceu.h" +#include "../../driver.h" /** GLOBALS **/ @@ -167,9 +168,9 @@ KeyboardCommands() // f4 controls rendering if(keyonly(F4)) { if(is_shift) { - FCEUI_SetRenderDisable(-1, 2); + FCEUI_SetRenderPlanes(true, false); } else { - FCEUI_SetRenderDisable(2, -1); + FCEUI_SetRenderPlanes(false, true); } } @@ -209,7 +210,7 @@ KeyboardCommands() // f5 to save state, Shift-f5 to save movie if(keyonly(F5)) { if(is_shift) { - FCEUI_SaveMovie(NULL,0); + FCEUI_SaveMovie(NULL,MOVIE_FLAG_NONE); } else { FCEUI_SaveState(NULL); } @@ -219,7 +220,7 @@ KeyboardCommands() if(keyonly(F7)) { if(is_shift) { //mbg merge 7/23/06 loadmovie takes another arg now - FCEUI_LoadMovie(NULL,0,0); + FCEUI_LoadMovie(NULL, false, false, false); } else { FCEUI_LoadState(NULL); } @@ -227,9 +228,11 @@ KeyboardCommands() } // f1 to toggle tile view + /* if(keyonly(F1)) { FCEUI_ToggleTileView(); } + */ // - to decrease speed, = to increase speed if(keyonly(MINUS)) { @@ -1126,6 +1129,7 @@ InputCfg(const std::string &text) } } + /** * Specify a FamiCom Expansion device as the 3rd input device. Takes * a text string describing the device. @@ -1184,6 +1188,7 @@ Input2(char *text) } } + /** GLOBALS **/ #if 0 CFGSTRUCT InputConfig[]={ diff --git a/src/utils/xstring.h b/src/utils/xstring.h index 7a52da0e..58442604 100644 --- a/src/utils/xstring.h +++ b/src/utils/xstring.h @@ -105,4 +105,4 @@ template void putdec(std::ostream* os, T dec) os->write(temp+DIGITS-ctr-1,ctr+1); else os->write(temp,DIGITS); -} \ No newline at end of file +}