diff --git a/src/Game.cpp b/src/Game.cpp index 0c38875d..2f9bbf75 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -468,7 +468,7 @@ int ModeAction() InitFlags(); InitBossLife(); - if ((bContinue && LoadProfile(NULL)) || InitializeGame()) + if ((bContinue && LoadProfile(NULL)) || InitializeGame(ghWnd)) { while (1) { diff --git a/src/Profile.cpp b/src/Profile.cpp index 753e9e10..290454b7 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -241,8 +241,10 @@ BOOL LoadProfile(const char *name) return TRUE; } -BOOL InitializeGame() +BOOL InitializeGame(HWND hWnd) { + (void)hWnd; + InitMyChar(); gSelectedArms = 0; gSelectedItem = 0; diff --git a/src/Profile.h b/src/Profile.h index 8c4a1947..4441a0e2 100644 --- a/src/Profile.h +++ b/src/Profile.h @@ -33,4 +33,4 @@ struct PROFILE BOOL IsProfile(); BOOL SaveProfile(const char *name); BOOL LoadProfile(const char *name); -BOOL InitializeGame(); +BOOL InitializeGame(HWND hWnd); diff --git a/src/TextScr.cpp b/src/TextScr.cpp index 5ef9e289..aa4c03f0 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -558,6 +558,7 @@ int TextScriptProc() char c[3]; int w, x, y, z; int i; + char str[72]; RECT rcSymbol = {64, 48, 72, 56}; @@ -1164,7 +1165,7 @@ int TextScriptProc() } else if (IS_COMMAND('I','N','I')) { - InitializeGame(); + InitializeGame(ghWnd); gTS.p_read += 4; } else if (IS_COMMAND('S','V','P')) @@ -1175,7 +1176,7 @@ int TextScriptProc() else if (IS_COMMAND('L','D','P')) { if (!LoadProfile(NULL)) - InitializeGame(); + InitializeGame(ghWnd); } else if (IS_COMMAND('F','A','C')) { @@ -1251,7 +1252,7 @@ int TextScriptProc() char str_0[0x40]; #ifdef NONPORTABLE sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); - MessageBoxA(ghWnd, str_0, "エラー", 0); + MessageBoxA(0, str_0, "エラー", 0); #else #ifdef JAPANESE sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); @@ -1282,7 +1283,6 @@ int TextScriptProc() else if (gTS.flags & 0x10) { //SAT/CAT/TUR printing - char str[72]; x = gTS.p_read; //Break if reaches command, or new-line while (gTS.data[x] != '<' && gTS.data[x] != '\r')