Reorganize variables scope for goto

See #17

src/character_selector.cc

@@ -240,6 +240,9 @@ int characterSelectorOpen()
 // 0x4A7468
 bool characterSelectorWindowInit()
 {
+    int backgroundFid;
+    unsigned char* backgroundFrmData;
+
     if (gCharacterSelectorWindow != -1) {
         return false;
     }
@@ -257,8 +260,8 @@ bool characterSelectorWindowInit()
     }
 
     CacheEntry* backgroundFrmHandle;
-    int backgroundFid = buildFid(6, 174, 0, 0, 0);
-    unsigned char* backgroundFrmData = artLockFrameData(backgroundFid, 0, 0, &backgroundFrmHandle);
+    backgroundFid = buildFid(6, 174, 0, 0, 0);
+    backgroundFrmData = artLockFrameData(backgroundFid, 0, 0, &backgroundFrmHandle);
     if (backgroundFrmData == NULL) {
         goto err;
     }

src/game.cc

@@ -62,6 +62,7 @@
 #include <unistd.h> // access
 #endif
 
+#include <cstring> // strcpy, strncmp
 #include <stdio.h>
 
 #define HELP_SCREEN_WIDTH (640)

src/game_dialog.cc

@@ -32,6 +32,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <cstring> // memset, strcpy
 
 #define GAME_DIALOG_WINDOW_WIDTH 640
 #define GAME_DIALOG_WINDOW_HEIGHT 480
@@ -1539,6 +1540,10 @@ int gameDialogSetReviewOptionText(const char* string)
 // 0x446288
 int _gdProcessInit()
 {
+    int upBtn; 
+    int downBtn;
+    int optionsWindowX;
+    int optionsWindowY;
     int fid;
 
     int replyWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_REPLY_WINDOW_X;
@@ -1549,7 +1554,7 @@ int _gdProcessInit()
     }
 
     // Top part of the reply window - scroll up.
-    int upBtn = buttonCreate(gGameDialogReplyWindow, 1, 1, 377, 28, -1, -1, KEY_ARROW_UP, -1, NULL, NULL, NULL, 32);
+    upBtn = buttonCreate(gGameDialogReplyWindow, 1, 1, 377, 28, -1, -1, KEY_ARROW_UP, -1, NULL, NULL, NULL, 32);
     if (upBtn == -1) {
         goto err_1;
     }
@@ -1558,7 +1563,7 @@ int _gdProcessInit()
     buttonSetMouseCallbacks(upBtn, _reply_arrow_up, _reply_arrow_restore, 0, 0);
 
     // Bottom part of the reply window - scroll down.
-    int downBtn = buttonCreate(gGameDialogReplyWindow, 1, 29, 377, 28, -1, -1, KEY_ARROW_DOWN, -1, NULL, NULL, NULL, 32);
+    downBtn = buttonCreate(gGameDialogReplyWindow, 1, 29, 377, 28, -1, -1, KEY_ARROW_DOWN, -1, NULL, NULL, NULL, 32);
     if (downBtn == -1) {
         goto err_1;
     }
@@ -1566,8 +1571,8 @@ int _gdProcessInit()
     buttonSetCallbacks(downBtn, _gsound_red_butt_press, _gsound_red_butt_release);
     buttonSetMouseCallbacks(downBtn, _reply_arrow_down, _reply_arrow_restore, 0, 0);
 
-    int optionsWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_OPTIONS_WINDOW_X;
-    int optionsWindowY = (screenGetHeight() - GAME_DIALOG_WINDOW_HEIGHT) / 2 + GAME_DIALOG_OPTIONS_WINDOW_Y;
+    optionsWindowX = (screenGetWidth() - GAME_DIALOG_WINDOW_WIDTH) / 2 + GAME_DIALOG_OPTIONS_WINDOW_X;
+    optionsWindowY = (screenGetHeight() - GAME_DIALOG_WINDOW_HEIGHT) / 2 + GAME_DIALOG_OPTIONS_WINDOW_Y;
     gGameDialogOptionsWindow = windowCreate(optionsWindowX, optionsWindowY, GAME_DIALOG_OPTIONS_WINDOW_WIDTH, GAME_DIALOG_OPTIONS_WINDOW_HEIGHT, 256, WINDOW_FLAG_0x04);
     if (gGameDialogOptionsWindow == -1) {
         goto err_2;

src/interface.cc

@@ -28,6 +28,7 @@
 #include "tile.h"
 #include "window_manager.h"
 
+#include <cstring> // memcpy, strcpy
 #include <stdio.h>
 
 // The width of connectors in the indicator box.

src/inventory.cc

@@ -36,6 +36,7 @@
 #include "window_manager.h"
 
 #include <assert.h>
+#include <cstring> // memcpy, strcpy
 #include <stdio.h>
 
 #include <algorithm>