diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-05-09 19:50:12 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-09 19:50:12 -0500 |
| commit | 69e7e904f546e93180f46cd0acbdd83c1f2af0eb (patch) | |
| tree | 7ad253f0ce631cb34bd2c280f3af29020a66190d /src | |
| parent | 6efc077b9f3e188e69b137f01018ada7d66dcf55 (diff) | |
| parent | 306b6678bbabae9fd74ca35807ceff61c52a343f (diff) | |
| download | kamek-69e7e904f546e93180f46cd0acbdd83c1f2af0eb.tar.gz kamek-69e7e904f546e93180f46cd0acbdd83c1f2af0eb.zip | |
Merge branch 'level-select' of ssh://treeki.rustedlogic.net:30000/Kamek into level-select
Diffstat (limited to '')
| -rw-r--r-- | src/koopatlas/core.cpp | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/koopatlas/core.cpp b/src/koopatlas/core.cpp index 1b2db0d..6e8db90 100644 --- a/src/koopatlas/core.cpp +++ b/src/koopatlas/core.cpp @@ -1081,6 +1081,16 @@ void dScKoopatlas_c::showSaveWindow() { yesNoWindow->visible = true; } +static const wchar_t *completionMsgs[] = { + L"butts", + L"You've collected all of\nthe \x0B\x014F\xBEEF Star Coins in", + L"You have gotten every \x0B\x013B\xBEEF exit\nin", + L"You have gotten everything\nin", + L"You have collected all the\nnecessary \x0B\x014F\xBEEF coins to enter\nthe Special World!", + L"You have collected all the \x0B\x014F\xBEEF Star\nCoins in the game!", + L"You've found every \x0B\x013B\xBEEF exit in the\ngame!", + L"You've completed everything in\nNEWER SUPER MARIO BROS. Wii!" +}; void dScKoopatlas_c::beginState_CompletionMsg() { OSReport("CompletionMsg beginning with type %d\n", pathManager.completionMessageType); @@ -1111,11 +1121,11 @@ void dScKoopatlas_c::executeState_CompletionMsg() { int type = pathManager.completionMessageType; - if (type >= CMP_MSG_COINS && type <= CMP_MSG_WORLD) { - // get the stuff we need: base BMG string - static const int bmgs[4] = {-1, 65, 58, 59}; - const wchar_t *baseText = GetBMG()->findStringForMessageID(0, bmgs[type]); + const wchar_t *baseText = completionMsgs[type]; + // Used when we assemble a dynamic message + wchar_t text[512]; + if (type >= CMP_MSG_COINS && type <= CMP_MSG_WORLD) { // title int w = pathManager.completionMessageWorldNum; int l = ((w == 5) || (w == 7)) ? 101 : 100; @@ -1123,7 +1133,6 @@ void dScKoopatlas_c::executeState_CompletionMsg() { const char *title = dLevelInfo_c::s_info.getNameForLevel(titleEntry); // assemble the string - wchar_t text[512]; wcscpy(text, baseText); int pos = wcslen(text); @@ -1138,10 +1147,11 @@ void dScKoopatlas_c::executeState_CompletionMsg() { text[pos++] = '!'; text[pos++] = 0; - - yesNoWindow->T_question_00->SetString(text); - yesNoWindow->T_questionS_00->SetString(text); + baseText = text; } + + yesNoWindow->T_question_00->SetString(baseText); + yesNoWindow->T_questionS_00->SetString(baseText); } if (!yesNoWindow->animationActive) { |