walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed the controls crash

This commit is contained in:
George Sokianos 2022-08-22 19:40:53 +01:00
parent 3b3fe085fa
commit 0ab9bfac9d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/defs.h
View File

@ -80,7 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define NUM_ATLAS_BUCKETS 64 #define NUM_ATLAS_BUCKETS 64
#define NUM_GLYPH_BUCKETS 128 #define NUM_GLYPH_BUCKETS 128
#define MAX_STARS 250 #define MAX_STARS 100
#define MAX_CHALLENGES 3 #define MAX_CHALLENGES 3

2
src/game/options.c
View File

@ -180,8 +180,6 @@ static void changeWindowSize(char *value)
static void changeEffectsReduction(char *value) static void changeEffectsReduction(char *value)
{ {
app.effects = atoi(value); app.effects = atoi(value);
// Mix_Volume(-1, app.effects * MIX_MAX_VOLUME / 10);
} }
static void changeSoundVolume(char *value) static void changeSoundVolume(char *value)

13
src/system/widgets.c
View File

@ -59,7 +59,7 @@ void doWidgets(void)
if (drawingWidgets) if (drawingWidgets)
{ {
updateSelectWidgets(); updateSelectWidgets();
handleMouse(); handleMouse();
handleKeyboard(); handleKeyboard();
@ -69,17 +69,21 @@ void doWidgets(void)
handleControlWidgets(); handleControlWidgets();
} }
} }
#if !defined(__amigaos4__)
if (hoverWidget != selectedWidget) if (hoverWidget != selectedWidget)
{ {
selectedWidget = NULL; selectedWidget = NULL;
} }
#endif
drawingWidgets = 0; drawingWidgets = 0;
} }
static void updateSelectWidgets(void) static void updateSelectWidgets(void)
{ {
#if !defined(__amigaos4__)
Widget *w; Widget *w;
for (w = head.next; w != NULL ; w = w->next) for (w = head.next; w != NULL ; w = w->next)
@ -99,6 +103,7 @@ static void updateSelectWidgets(void)
} }
} }
} }
#endif
} }
Widget *getWidget(const char *name, const char *group) Widget *getWidget(const char *name, const char *group)
@ -320,7 +325,6 @@ static void handleMouse(void)
static void handleKeyboard(void) static void handleKeyboard(void)
{ {
Widget *old; Widget *old;
if (selectedWidget != NULL) if (selectedWidget != NULL)
{ {
if (selectedWidget->type == WT_BUTTON) if (selectedWidget->type == WT_BUTTON)
@ -357,7 +361,7 @@ static void handleControlWidgets(void)
} }
else else
{ {
if (app.lastKeyPressed != -1) if (app.lastKeyPressed != -1 && selectedWidget->name)
{ {
updateControlKey(selectedWidget->name); updateControlKey(selectedWidget->name);
@ -601,3 +605,4 @@ void destroyWidgets(void)
head.next = NULL; head.next = NULL;
} }