Fixed game rejoin

skrmsh · Sep 24, 2023 · 8ad8f95 · 8ad8f95
1 parent 305fd44
commit 8ad8f95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/inc/game.cpp b/src/inc/game.cpp
@@ -135,6 +135,7 @@ bool Player::isInviolable() {
 Game::Game() {
     // Allocating 33 bytes of memory for gameID strings
     gid = (char *)malloc(33 * sizeof(char));
+    strcpy(gid, "");
     team = Team();
     player = Player();
     startTime = 0;

diff --git a/src/inc/ui.cpp b/src/inc/ui.cpp
@@ -108,19 +108,15 @@ void SkirmishUI::update() {
         uint32_t currentTS = getCurrentTS();
         if (game->gid[0] == 0) {  // No game
             setScene(SCENE_NO_GAME);
-
-        } else if (game->gid[0] != 0 &&     // joined
-                   game->startTime == 0) {  // but not started game
+        } else if (strcmp(game->gid, "") != 0 &&  // joined
+                   game->startTime == 0) {        // but not started game
             setScene(SCENE_JOINED_GAME);
-
         } else if (game->startTime > 0 &&           // started game
                    game->startTime >= currentTS) {  // but counting down
             setScene(SCENE_COUNTDOWN);
-
         } else if (game->startTime > 0 &&          // started game
                    game->startTime < currentTS) {  // but running
             setScene(SCENE_GAME);
-
         } else { /* Should never happen */
             setScene(SCENE_NO_SCENE);
         }