diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index db909849..153eebe2 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -138,10 +138,10 @@ void Backend_UnlockSurface(Backend_Surface *surface) const unsigned char *src_pixel = surface->pixels; // Convert the SDL_Surface's colour-keyed pixels to RGBA32 - for (int y = 0; y < surface->height; ++y) + for (unsigned int y = 0; y < surface->height; ++y) { - for (int x = 0; x < surface->width; ++x) + for (unsigned int x = 0; x < surface->width; ++x) { *buffer_pointer++ = src_pixel[0]; *buffer_pointer++ = src_pixel[1]; diff --git a/src/Game.cpp b/src/Game.cpp index 3afc2217..5d91cb91 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -683,9 +683,20 @@ BOOL Game(HWND hWnd) if (!LoadGenericData()) { -#ifdef WINDOWS - MessageBoxA(hWnd, "”Ä—pƒtƒ@ƒCƒ‹‚ª“ǂ߂Ȃ¢", "ƒGƒ‰[", MB_OK); // "Error - Couldn't read general purpose files" -#endif + #if defined(NONPORTABLE) && defined(WINDOWS) + #ifdef JAPANESE + MessageBoxA(hWnd, "\x94\xC4\x97\x70\x83\x74\x83\x40\x83\x43\x83\x8B\x82\xAA\x93\xC7\x82\xDF\x82\xC8\x82\xA2", "\x83\x47\x83\x89\x81\x5B", MB_OK); + #else + MessageBoxA(hWnd, "Couldn't read general purpose files", "Error", MB_OK); + #endif + #else + #ifdef JAPANESE + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "汎用ファイルãŒèª­ã‚ãªã„", NULL); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Couldn't read general purpose files", NULL); + #endif + #endif + return FALSE; } @@ -696,9 +707,20 @@ BOOL Game(HWND hWnd) if (!LoadNpcTable(path)) { -#ifdef WINDOWS - MessageBoxA(hWnd, "NPCƒe[ƒuƒ‹‚ª“ǂ߂Ȃ¢", "ƒGƒ‰[", MB_OK); // "Error - Couldn't read the NPC table" -#endif + #if defined(NONPORTABLE) && defined(WINDOWS) + #ifdef JAPANESE + MessageBoxA(hWnd, "\x4E\x50\x43\x83\x65\x81\x5B\x83\x75\x83\x8B\x82\xAA\x93\xC7\x82\xDF\x82\xC8\x82\xA2", "\x83\x47\x83\x89\x81\x5B", MB_OK); + #else + MessageBoxA(hWnd, "Couldn't read the NPC table", "Error", MB_OK); + #endif + #else + #ifdef JAPANESE + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "NPCテーブルãŒèª­ã‚ãªã„", NULL); + #else + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Couldn't read the NPC table", NULL); + #endif + #endif + return FALSE; } diff --git a/src/Profile.cpp b/src/Profile.cpp index c3fa9107..8181a97c 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -256,7 +256,7 @@ BOOL InitializeGame(HWND hWnd) { #if defined(NONPORTABLE) && defined(WINDOWS) #ifdef JAPANESE - MessageBoxA(hWnd, "ƒXƒe[ƒW‚̓ǂݞ‚݂Ɏ¸”s", "ƒGƒ‰[", MB_OK); + MessageBoxA(hWnd, "\x83\x58\x83\x65\x81\x5B\x83\x57\x82\xCC\x93\xC7\x82\xDD\x8D\x9E\x82\xDD\x82\xC9\x8E\xB8\x94\x73", "\x83\x47\x83\x89\x81\x5B", MB_OK); #else MessageBoxA(hWnd, "Failed to load stage", "Error", MB_OK); #endif @@ -264,7 +264,7 @@ BOOL InitializeGame(HWND hWnd) (void)hWnd; #ifdef JAPANESE - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "ƒGƒ‰[", "ƒXƒe[ƒW‚̓ǂݞ‚݂Ɏ¸”s", NULL); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージã®èª­ã¿è¾¼ã¿ã«å¤±æ•—", NULL); #else SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); #endif diff --git a/src/TextScr.cpp b/src/TextScr.cpp index 09c928f2..35917069 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -709,13 +709,13 @@ int TextScriptProc() { #if defined(NONPORTABLE) && defined(WINDOWS) #ifdef JAPANESE - MessageBoxA(ghWnd, "ƒXƒe[ƒW‚̓ǂݞ‚݂Ɏ¸”s", "ƒGƒ‰[", MB_OK); + MessageBoxA(ghWnd, "\x83\x58\x83\x65\x81\x5B\x83\x57\x82\xCC\x93\xC7\x82\xDD\x8D\x9E\x82\xDD\x82\xC9\x8E\xB8\x94\x73", "\x83\x47\x83\x89\x81\x5B", MB_OK); #else MessageBoxA(ghWnd, "Failed to load stage", "Error", MB_OK); #endif #else #ifdef JAPANESE - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "ƒGƒ‰[", "ƒXƒe[ƒW‚̓ǂݞ‚݂Ɏ¸”s", NULL); + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "エラー", "ステージã®èª­ã¿è¾¼ã¿ã«å¤±æ•—", NULL); #else SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Error", "Failed to load stage", NULL); #endif @@ -1273,11 +1273,12 @@ int TextScriptProc() { char str_0[0x40]; #ifdef JAPANESE - sprintf(str_0, "•s–¾‚̃R[ƒh:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); #if defined(NONPORTABLE) && defined(WINDOWS) - MessageBoxA(NULL, str_0, "ƒGƒ‰[", MB_OK); + sprintf(str_0, "\x95\x73\x96\xBE\x82\xCC\x83\x52\x81\x5B\x83\x68:<%c%c%c", gTS.data[gTS.p_read + 1], gTS.data[gTS.p_read + 2], gTS.data[gTS.p_read + 3]); + MessageBoxA(NULL, str_0, "\x83\x47\x83\x89\x81\x5B", MB_OK); #else - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "ƒGƒ‰[", str_0, NULL); + 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); #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]);