mirror of
https://github.com/dborth/fceugx.git
synced 2025-01-07 22:30:46 +01:00
minor changes
This commit is contained in:
parent
27e503ed01
commit
9331e69277
@ -38,6 +38,8 @@ void FixInvalidSettings()
|
|||||||
GCSettings.MusicVolume = 40;
|
GCSettings.MusicVolume = 40;
|
||||||
if(!(GCSettings.SFXVolume >= 0 && GCSettings.SFXVolume <= 100))
|
if(!(GCSettings.SFXVolume >= 0 && GCSettings.SFXVolume <= 100))
|
||||||
GCSettings.SFXVolume = 40;
|
GCSettings.SFXVolume = 40;
|
||||||
|
if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_ZAPPER)
|
||||||
|
GCSettings.Controller = CTRL_PAD2;
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define _FCEUGX_H_
|
#define _FCEUGX_H_
|
||||||
|
|
||||||
#define APPNAME "FCE Ultra GX"
|
#define APPNAME "FCE Ultra GX"
|
||||||
#define APPVERSION "2.0.9"
|
#define APPVERSION "3.0.0"
|
||||||
#define PREF_FILE_NAME "settings.xml"
|
#define PREF_FILE_NAME "settings.xml"
|
||||||
|
|
||||||
#define NOTSILENT 0
|
#define NOTSILENT 0
|
||||||
|
@ -927,13 +927,10 @@ static void ControllerWindowUpdate(void * ptr, int dir)
|
|||||||
{
|
{
|
||||||
GCSettings.Controller += dir;
|
GCSettings.Controller += dir;
|
||||||
|
|
||||||
if(GCSettings.Controller == CTRL_PAD) // skip
|
if(GCSettings.Controller > CTRL_PAD4)
|
||||||
GCSettings.Controller += dir;
|
GCSettings.Controller = CTRL_ZAPPER;
|
||||||
|
else if(GCSettings.Controller < CTRL_ZAPPER)
|
||||||
if(GCSettings.Controller > CTRL_LENGTH-1)
|
GCSettings.Controller = CTRL_PAD4;
|
||||||
GCSettings.Controller = 0;
|
|
||||||
else if(GCSettings.Controller < 0)
|
|
||||||
GCSettings.Controller = CTRL_LENGTH-1;
|
|
||||||
|
|
||||||
settingText->SetText(ctrlName[GCSettings.Controller]);
|
settingText->SetText(ctrlName[GCSettings.Controller]);
|
||||||
b->ResetState();
|
b->ResetState();
|
||||||
@ -945,7 +942,7 @@ static void ControllerWindowRightClick(void * ptr) { ControllerWindowUpdate(ptr,
|
|||||||
|
|
||||||
static void ControllerWindow()
|
static void ControllerWindow()
|
||||||
{
|
{
|
||||||
GuiWindow * w = new GuiWindow(250,250);
|
GuiWindow * w = new GuiWindow(300,250);
|
||||||
w->SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
|
w->SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
|
||||||
|
|
||||||
GuiTrigger trigA;
|
GuiTrigger trigA;
|
||||||
|
Loading…
Reference in New Issue
Block a user