From 0d87786af4f4908baad14acfb83d2ed7ca1281ae Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Thu, 15 Feb 2018 22:56:22 +0000
Subject: [PATCH] More widget work.

---
 sound/146721__fins__menu-click.ogg | Bin 0 -> 4674 bytes
 src/defs.h                         |   5 ++-
 src/structs.h                      |   1 -
 src/system/sound.c                 |   7 ++-
 src/system/widgets.c               |  15 +++++--
 src/system/widgets.h               |   1 +
 src/world/world.c                  |  67 +++++++++++++++++++++++------
 src/world/world.h                  |   3 ++
 8 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 sound/146721__fins__menu-click.ogg

diff --git a/sound/146721__fins__menu-click.ogg b/sound/146721__fins__menu-click.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..8bd7aedf20dc9340b3b1da9e86624841e1e45e20
GIT binary patch
literal 4674
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

literal 0
HcmV?d00001

diff --git a/src/defs.h b/src/defs.h
index 8d46c8a..50b955c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -268,8 +268,9 @@ enum
 
 enum
 {
-	SND_SELECT,
-	SND_BACK,
+	SND_MENU_SELECT,
+	SND_MENU_BACK,
+	SND_MENU_NAV,
 	SND_PISTOL,
 	SND_MACHINE_GUN,
 	SND_PLASMA,
diff --git a/src/structs.h b/src/structs.h
index 873ff3a..6cf98aa 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -451,7 +451,6 @@ typedef struct {
 	int minEnemySpawnTime, maxEnemySpawnTime;
 	unsigned long entityCounter;
 	int entityChaseTimer;
-	int showingInfoMessage;
 	int allObjectivesComplete;
 	int frameCounter;
 	int currentStatus;
diff --git a/src/system/sound.c b/src/system/sound.c
index 8cca88a..36473e1 100644
--- a/src/system/sound.c
+++ b/src/system/sound.c
@@ -88,8 +88,10 @@ static Mix_Chunk *loadSound(char *filename)
 
 static void loadSounds(void)
 {
-	sounds[SND_BACK] = loadSound("sound/50557__broumbroum__sf3-sfx-menu-back.ogg");
-	sounds[SND_SELECT] = loadSound("sound/50561__broumbroum__sf3-sfx-menu-select.ogg");
+	sounds[SND_MENU_BACK] = loadSound("sound/50557__broumbroum__sf3-sfx-menu-back.ogg");
+	sounds[SND_MENU_SELECT] = loadSound("sound/50561__broumbroum__sf3-sfx-menu-select.ogg");
+	sounds[SND_MENU_NAV] = loadSound("sound/146721__fins__menu-click.ogg");
+	
 	sounds[SND_PISTOL] = loadSound("sound/Gun_44magnum-freesoundeffects.ogg");
 	sounds[SND_MACHINE_GUN] = loadSound("sound/67020__ls__submachinegun2.ogg");
 	sounds[SND_PLASMA] = loadSound("sound/93017__cosmicd__60.ogg");
@@ -127,6 +129,7 @@ static void loadSounds(void)
 	sounds[SND_DENIED] = loadSound("sound/142608__autistic-lucario__error.ogg");
 	sounds[SND_CONFIRMED] = loadSound("sound/39028__wildweasel__cardlock-open.ogg");
 	sounds[SND_HEART_CELL] = loadSound("sound/162467__kastenfrosch__gotitem.ogg");
+	
 	sounds[SND_MISSION_COMPLETE] = loadSound("sound/113989__kastenfrosch__gewonnen.ogg");
 	sounds[SND_TROPHY] = loadSound("sound/278142__ricemaster__effect-notify.ogg");
 }
diff --git a/src/system/widgets.c b/src/system/widgets.c
index df31cc7..336d12d 100644
--- a/src/system/widgets.c
+++ b/src/system/widgets.c
@@ -37,6 +37,8 @@ void initWidgets(void)
 
 	numWidgets = 0;
 	
+	selectedWidget = NULL;
+	
 	loadWidgets();
 }
 
@@ -102,16 +104,15 @@ void drawWidgets(void)
 				case WT_BUTTON:
 					if (w != selectedWidget)
 					{
-						drawRect(w->x, w->y, w->w, w->h, 0, 64, 0, 255);
+						drawRect(w->x, w->y, w->w, w->h, 0, 0, 0, 255);
 						drawOutlineRect(w->x, w->y, w->w, w->h, 0, 128, 0, 255);
-						drawText(w->x + w->w / 2, w->y + 2, 24, TA_CENTER, colors.white, w->label);
 					}
 					else
 					{
 						drawRect(w->x, w->y, w->w, w->h, 0, 128, 0, 255);
 						drawOutlineRect(w->x, w->y, w->w, w->h, 0, 255, 0, 255);
-						drawText(w->x + w->w / 2, w->y + 2, 24, TA_CENTER, colors.yellow, w->label);
 					}
+					drawText(w->x + w->w / 2, w->y + 2, 24, TA_CENTER, colors.white, w->label);
 					break;
 
 				case WT_SLIDER:
@@ -129,6 +130,8 @@ void drawWidgets(void)
 
 static void selectWidget(int dir)
 {
+	int oldWidgetIndex = widgetIndex;
+	
 	do
 	{
 		widgetIndex += dir;
@@ -146,6 +149,11 @@ static void selectWidget(int dir)
 		selectedWidget = &widgets[widgetIndex];
 
 	} while (!selectedWidget->enabled && !selectedWidget->visible);
+	
+	if (oldWidgetIndex != widgetIndex)
+	{
+		playSound(SND_MENU_NAV, 0);
+	}
 }
 
 Widget *getWidget(char *name, char *group)
@@ -197,6 +205,7 @@ void showWidgetGroup(char *group)
 			if (selectedWidget == NULL)
 			{
 				selectedWidget = w;
+				widgetIndex = i;
 			}
 
 			w->visible = 1;
diff --git a/src/system/widgets.h b/src/system/widgets.h
index 6f12dce..8478661 100644
--- a/src/system/widgets.h
+++ b/src/system/widgets.h
@@ -28,6 +28,7 @@ extern void drawText(int x, int y, int size, int align, SDL_Color c, const char
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern float limit(float i, float a, float b);
+extern void playSound(int snd, int ch);
 
 extern App app;
 extern Colors colors;
diff --git a/src/world/world.c b/src/world/world.c
index 077b73e..e6e35db 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -36,6 +36,10 @@ static void spawnEnemies(void);
 static int canAdd(Unit *u, int mx, int my);
 static void startMission(void);
 static void drawInGameWidgets(void);
+static void handleWidgets(void);
+static void resume(void);
+static void options(void);
+static void quit(void);
 
 static Texture *background;
 static int observationIndex;
@@ -68,6 +72,10 @@ void initWorld(void)
 	world.state = WS_START;
 
 	observationIndex = 0;
+	
+	getWidget("resume", "gamePaused")->action = resume;
+	getWidget("options", "gamePaused")->action = options;
+	getWidget("quit", "gamePaused")->action = quit;
 
 	if (world.missionType == MT_BOSS)
 	{
@@ -90,10 +98,6 @@ void initWorld(void)
 	app.delegate.logic = logic;
 	app.delegate.draw = draw;
 	
-	showWidgetGroup("gamePaused");
-	
-	showingWidgets = 1;
-	
 	startMission();
 }
 
@@ -259,7 +263,7 @@ static void doWorldInProgress(void)
 
 	doPlayer();
 	
-	if (!world.showingInfoMessage)
+	if (!showingWidgets)
 	{
 		doBob();
 
@@ -296,16 +300,38 @@ static void doWorldInProgress(void)
 			initRadar();
 			clearControl(CONTROL_MAP);
 		}
-	}
-
-	if (world.observationTimer > 0)
-	{
-		if (--world.observationTimer == FPS * 1.5)
+		
+		if (app.keyboard[SDL_SCANCODE_ESCAPE])
 		{
-			world.entityToTrack = world.entitiesToObserve[0];
-
-			world.state = WS_OBSERVING;
+			app.keyboard[SDL_SCANCODE_ESCAPE] = 0;
+			showWidgetGroup("gamePaused");
+			playSound(SND_MENU_BACK, 0);
+			showingWidgets = 1;
 		}
+		
+		if (world.observationTimer > 0)
+		{
+			if (--world.observationTimer == FPS * 1.5)
+			{
+				world.entityToTrack = world.entitiesToObserve[0];
+
+				world.state = WS_OBSERVING;
+			}
+		}
+	}
+	else
+	{
+		handleWidgets();
+	}
+}
+
+static void handleWidgets(void)
+{
+	doWidgets();
+	
+	if (app.keyboard[SDL_SCANCODE_ESCAPE])
+	{
+		resume();
 	}
 }
 
@@ -616,3 +642,18 @@ void exitRadar(void)
 	
 	endSectionTransition();
 }
+
+static void resume(void)
+{
+	app.keyboard[SDL_SCANCODE_ESCAPE] = 0;
+	hideAllWidgets();
+	showingWidgets = 0;
+}
+
+static void options(void)
+{
+}
+
+static void quit(void)
+{
+}
diff --git a/src/world/world.h b/src/world/world.h
index 19d0964..c9a14eb 100644
--- a/src/world/world.h
+++ b/src/world/world.h
@@ -76,6 +76,9 @@ extern void drawWidgets(void);
 extern void showWidgetGroup(char *group);
 extern void drawRect(int x, int y, int w, int h, int r, int g, int b, int a);
 extern void drawOutlineRect(int x, int y, int w, int h, int r, int g, int b, int a);
+extern void hideAllWidgets(void);
+extern void doWidgets(void);
+extern Widget *getWidget(char *name, char *group);
 
 extern App app;
 extern Colors colors;