diff options
| -rw-r--r-- | libretro.c | 4 | ||||
| -rw-r--r-- | source/gfx.c | 48 |
2 files changed, 2 insertions, 50 deletions
@@ -258,7 +258,6 @@ const char* S9xGetFilename(const char* ex) void GetBaseName(const char* ex) { - static char filename [PATH_MAX + 1]; char drive [_MAX_DRIVE + 1]; char dir [_MAX_DIR + 1]; char fname [_MAX_FNAME + 1]; @@ -942,7 +941,7 @@ void retro_unload_game(void) void* retro_get_memory_data(unsigned type) { - uint8_t* data; + uint8_t* data = NULL; switch(type) { @@ -964,7 +963,6 @@ void* retro_get_memory_data(unsigned type) // data = Memory.ROM; // break; default: - data = NULL; break; } diff --git a/source/gfx.c b/source/gfx.c index 633e2ab..a0880e6 100644 --- a/source/gfx.c +++ b/source/gfx.c @@ -102,8 +102,6 @@ void output_png(); void ComputeClipWindows(); -static void S9xDisplayFrameRate(); -static void S9xDisplayString(const char* string); extern uint8_t BitShifts[8][4]; extern uint8_t TileShifts[8][4]; @@ -3407,51 +3405,7 @@ void DisplayChar(uint8_t* Screen, uint8_t c) } } -static void S9xDisplayFrameRate() -{ - uint8_t* Screen = GFX.Screen + 2 + - (IPPU.RenderedScreenHeight - font_height - 1) * GFX.Pitch2; - char string [10]; - int len = 5; - - sprintf(string, "%02d/%02d", IPPU.DisplayedRenderedFrameCount, - (int) Memory.ROMFramesPerSecond); - - int i; - for (i = 0; i < len; i++) - { - DisplayChar(Screen, string [i]); - Screen += (font_width - 1) * sizeof(uint16_t); - } -} - -static void S9xDisplayString(const char* string) -{ - uint8_t* Screen = GFX.Screen + 2 + - (IPPU.RenderedScreenHeight - font_height * 5) * GFX.Pitch2; - int len = strlen(string); - int max_chars = IPPU.RenderedScreenWidth / (font_width - 1); - int char_count = 0; - int i; - - for (i = 0; i < len; i++, char_count++) - { - if (char_count >= max_chars || string [i] < 32) - { - Screen -= (font_width - 1) * max_chars * sizeof(uint16_t); - Screen += font_height * GFX.Pitch; - if (Screen >= GFX.Screen + GFX.Pitch * IPPU.RenderedScreenHeight) - break; - char_count -= max_chars; - } - if (string [i] < 32) - continue; - DisplayChar(Screen, string [i]); - Screen += (font_width - 1) * sizeof(uint16_t); - } -} - -void S9xUpdateScreen() +void S9xUpdateScreen(void) { int32_t x2 = 1; |