c64
/
pi1541
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

And search for chargen in /roms/ too

This commit is contained in:
penfold42 2018-08-08 23:11:58 +10:00
parent aed4baee1c
commit 36eb8efd7b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -1189,21 +1189,28 @@ static void CheckOptions()
u32 widthScreen = screen.Width(); u32 widthScreen = screen.Width();
u32 heightScreen = screen.Height(); u32 heightScreen = screen.Height();
u32 xpos, ypos; u32 xpos, ypos;
const char* ROMName;
deviceID = (u8)options.GetDeviceID(); deviceID = (u8)options.GetDeviceID();
DEBUG_LOG("DeviceID = %d\r\n", deviceID); DEBUG_LOG("DeviceID = %d\r\n", deviceID);
ROMName = options.GetRomFontName(); const char* FontROMName = options.GetRomFontName();
if (ROMName) if (FontROMName)
{ {
char FontROMName2[256] = "/roms/";
if (FontROMName[0] != '/') // not a full path, prepend /roms/
strncat (FontROMName2, FontROMName, 240);
else
FontROMName2[0] = 0;
//DEBUG_LOG("%d Rom Name = %s\r\n", ROMIndex, ROMName); //DEBUG_LOG("%d Rom Name = %s\r\n", ROMIndex, ROMName);
if (FR_OK == f_open(&fp, ROMName, FA_READ)) if ( (FR_OK == f_open(&fp, FontROMName, FA_READ))
|| (FR_OK == f_open(&fp, FontROMName2, FA_READ)) )
{ {
u32 bytesRead; u32 bytesRead;
screen.Clear(COLOUR_BLACK); screen.Clear(COLOUR_BLACK);
snprintf(tempBuffer, tempBufferSize, "Loading ROM %s\r\n", ROMName); snprintf(tempBuffer, tempBufferSize, "Loading Font ROM %s\r\n", FontROMName);
screen.MeasureText(false, tempBuffer, &widthText, &heightText); screen.MeasureText(false, tempBuffer, &widthText, &heightText);
xpos = (widthScreen - widthText) >> 1; xpos = (widthScreen - widthText) >> 1;
ypos = (heightScreen - heightText) >> 1; ypos = (heightScreen - heightText) >> 1;