duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MessageBoxA usage cleanup

Browse source
This commit is contained in:
Clownacy 2019-06-20 21:17:32 +01:00
parent 546631fad7
commit 427fe69374
2 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Profile.cpp
View file

@ -254,21 +254,22 @@ BOOL InitializeGame(HWND hWnd)
InitFlags(); InitFlags();
if (!TransferStage(13, 200, 10, 8)) if (!TransferStage(13, 200, 10, 8))
{ {
#if defined(NONPORTABLE) && defined(WINDOWS) #if defined(NONPORTABLE) && defined(WINDOWS)
#ifdef JAPANESE #ifdef JAPANESE
MessageBoxA(hWnd, "ステージの読み込みに失敗", "エラー", MB_OK); MessageBoxA(hWnd, "ステージの読み込みに失敗", "エラー", MB_OK);
#else #else
MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK); MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK);
#endif #endif
#else #else
(void)hWnd; (void)hWnd;
#ifdef JAPANESE
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
#else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL);
#endif
#endif
#ifdef JAPANESE
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
#else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL);
#endif
#endif
return FALSE; return FALSE;
} }

23
src/TextScr.cpp
View file

@ -695,7 +695,11 @@ int TextScriptProc()
if (!TransferStage(z, w, x, y)) if (!TransferStage(z, w, x, y))
{ {
#if defined(NONPORTABLE) && defined(WINDOWS) #if defined(NONPORTABLE) && defined(WINDOWS)
MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", 0); #ifdef JAPANESE
MessageBoxA(ghWnd, "ステージの読み込みに失敗", "エラー", MB_OK);
#else
MessageBoxA(ghWnd, "Failed to load stage", "Error", MB_OK);
#endif
#else #else
#ifdef JAPANESE #ifdef JAPANESE
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL); SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージの読み込みに失敗", NULL);
@ -1250,16 +1254,19 @@ int TextScriptProc()
else else
{ {
char str_0[0x40]; char str_0[0x40];
#if defined(NONPORTABLE) && defined(WINDOWS) #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]);
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]); sprintf(str_0, "不明のコード:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL); #if defined(NONPORTABLE) && defined(WINDOWS)
MessageBoxA(NULL, str_0, "エラー", MB_OK);
#else #else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", str_0, NULL);
#endif
#else
sprintf(str_0, "Unknown code:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); sprintf(str_0, "Unknown code:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL); #if defined(NONPORTABLE) && defined(WINDOWS)
MessageBoxA(NULL, str_0, "Error", MB_OK);
#else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", str_0, NULL);
#endif #endif
#endif #endif