RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 06:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

renderer bugfix, minor adjustments

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@395 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-03-25 22:37:37 +00:00
parent 8e708f920f
commit 67dfdf5fa6
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/config.c
View file

@ -21,7 +21,7 @@ extern const int cdopt_entry_count;
static menu_entry *cfg_opts[] = { opt_entries, opt2_entries, cdopt_entries }; static menu_entry *cfg_opts[] = { opt_entries, opt2_entries, cdopt_entries };
static const int *cfg_opt_counts[] = { &opt_entry_count, &opt2_entry_count, &cdopt_entry_count }; static const int *cfg_opt_counts[] = { &opt_entry_count, &opt2_entry_count, &cdopt_entry_count };
#define NL "\n" #define NL "\r\n"
static char *mystrip(char *str) static char *mystrip(char *str)
@ -322,6 +322,9 @@ write:
keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 1); keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 1);
keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 1); keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 1);
if (section == NULL)
fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume);
fprintf(fn, NL); fprintf(fn, NL);
if (fo != NULL) if (fo != NULL)
@ -626,6 +629,11 @@ static void parse(const char *var, const char *val)
if (strcasecmp(var, "LastUsedROM") == 0) if (strcasecmp(var, "LastUsedROM") == 0)
return; /* handled elsewhere */ return; /* handled elsewhere */
if (strcasecmp(var, "Sound Volume") == 0) {
currentConfig.volume = atoi(val);
return;
}
// key binds // key binds
if (strncasecmp(var, "bind ", 5) == 0) { if (strncasecmp(var, "bind ", 5) == 0) {
keys_parse(var + 5, val, currentConfig.KeyBinds, keyNames); keys_parse(var + 5, val, currentConfig.KeyBinds, keyNames);

2
common/emu.c
View file

@ -511,8 +511,10 @@ int emu_ReadConfig(int game, int no_defaults)
ret = -1; ret = -1;
if (config_havesect(cfg, sect)) { if (config_havesect(cfg, sect)) {
int vol = currentConfig.volume;
emu_setDefaultConfig(); emu_setDefaultConfig();
ret = config_readsect(cfg, sect); ret = config_readsect(cfg, sect);
currentConfig.volume = vol; // make vol global (bah)
} }
if (ret != 0) if (ret != 0)

2
gp2x/emu.c
View file

@ -272,7 +272,7 @@ static void blit(const char *fps, const char *notice)
vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32(localPal, Pico.cram, 0x40);
vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
blockcpy(localPal+0xc0, localPal+0x40, 0x40*4); memcpy32(localPal+0xc0, localPal+0x40, 0x40);
localPal[0xc0] = 0x0000c000; localPal[0xc0] = 0x0000c000;
localPal[0xd0] = 0x00c00000; localPal[0xd0] = 0x00c00000;
localPal[0xe0] = 0x00000000; // reserved pixels for OSD localPal[0xe0] = 0x00000000; // reserved pixels for OSD