michael
/
MorriCraft
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Finalize options UI and music state - v1.9.1

This commit is contained in:
Michael Howard 2026-04-23 16:52:48 -05:00
parent c599fd1fef
commit fbe39fb089
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build-linux/MorriCraft
View File

Binary file not shown.

BIN
build-windows/MorriCraft.exe
View File

Binary file not shown.

9
src/main.cpp
View File

@ -857,9 +857,9 @@ int main(void)
// Update // Update
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Update ONLY active music streams and ensure others are fully stopped // Update ONLY active music streams and ensure others are fully stopped
if (currentState == MAIN_MENU || currentState == LOAD_WORLD_MENU || currentState == CREATE_WORLD_MENU || bool inGame = (currentState == GAMEPLAY || currentState == PAUSE_MENU || currentState == CRAFTING_GUI || (currentState == OPTIONS_MENU && optionsReturnState != MAIN_MENU));
currentState == CHECKING_UPDATES || currentState == UPDATE_FOUND || currentState == UPDATE_NOTES ||
currentState == DOWNLOADING_UPDATE) { if (!inGame) {
UpdateMusicStream(titleMusic); UpdateMusicStream(titleMusic);
if (IsMusicStreamPlaying(gameplayMusic)) StopMusicStream(gameplayMusic); if (IsMusicStreamPlaying(gameplayMusic)) StopMusicStream(gameplayMusic);
if (IsMusicStreamPlaying(nightMusic)) StopMusicStream(nightMusic); if (IsMusicStreamPlaying(nightMusic)) StopMusicStream(nightMusic);
@ -883,7 +883,6 @@ int main(void)
// Handle crossfading based on state // Handle crossfading based on state
static float crossfade = 0.0f; // 0.0 = title, 1.0 = gameplay static float crossfade = 0.0f; // 0.0 = title, 1.0 = gameplay
bool inGame = (currentState == GAMEPLAY || currentState == PAUSE_MENU || currentState == CRAFTING_GUI || (currentState == OPTIONS_MENU && optionsReturnState != MAIN_MENU));
if (inGame) { if (inGame) {
crossfade += 0.02f; crossfade += 0.02f;
@ -1528,7 +1527,7 @@ int main(void)
// Draw options panel // Draw options panel
int panelWidth = 600; int panelWidth = 600;
int panelHeight = 400; int panelHeight = 480; // Increased from 400
int panelX = (currentWidth / 2) - (panelWidth / 2); int panelX = (currentWidth / 2) - (panelWidth / 2);
int panelY = (currentHeight / 2) - (panelHeight / 2); int panelY = (currentHeight / 2) - (panelHeight / 2);