diff options
| author | sfan5 <sfan5@live.de> | 2015-04-27 16:17:10 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2015-04-27 16:24:49 +0200 |
| commit | 4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d (patch) | |
| tree | 4cb19102443b8ea6f566522c964ba92c905a55a8 /src/game.cpp | |
| parent | 558d715bf62b000c9b10b44a0e3591ed4e669fa5 (diff) | |
| download | minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.tar.gz minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.tar.bz2 minetest-4ea5a96fffb1a0300f73e97d4c85bb5c32e3786d.zip | |
Revert the upper-case PROJECT_NAME nonsense that was part of #2402
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index 706f118cb..af68a2571 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1134,7 +1134,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec, os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;" << wide_to_narrow(wstrgettext("Exit to OS")) << "]" << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]" - << "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME "\n" + << "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n" << g_build_info << "\n" << "path_user = " << wrap_rows(porting::path_user, 20) << "\n;]"; @@ -2029,7 +2029,7 @@ bool Game::createClient(const std::string &playername, /* Set window caption */ - std::wstring str = narrow_to_wide(PROJECT_NAME); + std::wstring str = narrow_to_wide(PROJECT_NAME_C); str += L" ["; str += driver->getName(); str += L"]"; @@ -2054,7 +2054,7 @@ bool Game::initGui() { // First line of debug text guitext = guienv->addStaticText( - narrow_to_wide(PROJECT_NAME).c_str(), + narrow_to_wide(PROJECT_NAME_C).c_str(), core::rect<s32>(0, 0, 0, 0), false, false, guiroot); @@ -4018,7 +4018,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats, std::ostringstream os(std::ios_base::binary); os << std::fixed - << PROJECT_NAME " " << g_version_hash + << PROJECT_NAME_C " " << g_version_hash << " FPS = " << fps << " (R: range_all=" << draw_control->range_all << ")" << std::setprecision(0) @@ -4034,7 +4034,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats, guitext->setVisible(true); } else if (flags.show_hud || flags.show_chat) { std::ostringstream os(std::ios_base::binary); - os << PROJECT_NAME " " << g_version_hash; + os << PROJECT_NAME_C " " << g_version_hash; guitext->setText(narrow_to_wide(os.str()).c_str()); guitext->setVisible(true); } else { @@ -4267,7 +4267,7 @@ void the_game(bool *kill, } catch (SerializationError &e) { error_message = std::string("A serialization error occurred:\n") + e.what() + "\n\nThe server is probably " - " running a different version of " PROJECT_NAME "."; + " running a different version of " PROJECT_NAME_C "."; errorstream << error_message << std::endl; } catch (ServerError &e) { error_message = e.what(); |