Cleanup window

alexbatalov · Nov 17, 2022 · f390761 · f390761
1 parent b191946
commit f390761
Show file tree

Hide file tree

Showing 9 changed files with 606 additions and 638 deletions.
diff --git a/src/game/game.c b/src/game/game.c
@@ -153,7 +153,7 @@ int game_init(const char* windowTitle, bool isMapper, int font, int a4, int argc
 
     annoy_user();
     win_set_minimized_title(windowTitle);
-    _initWindow(1, a4);
+    initWindow(1, a4);
     palette_init();
 
     char* language;
@@ -426,7 +426,7 @@ void game_exit()
     endgameDeathEndingExit();
     FMExit();
     trap_exit();
-    _windowClose();
+    windowClose();
     dbExit();
     gconfig_exit(true);
 }

diff --git a/src/game/gdialog.c b/src/game/gdialog.c
@@ -3144,7 +3144,7 @@ void barter_end_to_talk_to()
     dialogQuit();
     dialogClose();
     updatePrograms();
-    _updateWindows();
+    updateWindows();
     dialogue_state = 1;
     dialogue_switch_mode = 1;
 }

diff --git a/src/game/scripts.c b/src/game/scripts.c
@@ -615,7 +615,7 @@ static void doBkProcesses()
         }
     }
 
-    _updateWindows();
+    updateWindows();
 
     if (script_engine_running && script_engine_run_critters) {
         if (!gdialogActive()) {

diff --git a/src/int/dialog.c b/src/int/dialog.c
@@ -319,7 +319,7 @@ static void printLine(int win, char** strings, int strings_num, int a4, int a5,
 
     for (i = 0; i < strings_num; i++) {
         v11 = a7 + i * text_height();
-        _windowPrintBuf(win, strings[i], strlen(strings[i]), a4, a5 + a7, a6, v11, a8, a9);
+        windowPrintBuf(win, strings[i], strlen(strings[i]), a4, a5 + a7, a6, v11, a8, a9);
     }
 }
 
@@ -329,9 +329,9 @@ static void printStr(int win, char* a2, int a3, int a4, int a5, int a6, int a7,
     char** strings;
     int strings_num;
 
-    strings = _windowWordWrap(a2, a3, 0, &strings_num);
+    strings = windowWordWrap(a2, a3, 0, &strings_num);
     printLine(win, strings, strings_num, a3, a4, a5, a6, a7, a8);
-    _windowFreeWordList(strings, strings_num);
+    windowFreeWordList(strings, strings_num);
 }
 
 // 0x430104