diff --git a/CMakeLists.txt b/CMakeLists.txt index 2561d1917..91c90e7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,8 +197,8 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An InfiniMiner/Minecraft inspired game") set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) -set(CPACK_PACKAGE_VENDOR "celeron55") -set(CPACK_PACKAGE_CONTACT "Perttu Ahola ") +set(CPACK_PACKAGE_VENDOR "MoNTE48") +set(CPACK_PACKAGE_CONTACT "MoNTE48@mail.ua") if(WIN32) if(CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/build/android/Makefile b/build/android/Makefile index 569a45a68..c989a0b77 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -19,8 +19,8 @@ GAMES_TO_COPY = minetest_game # Android Version code # Increase for each build! ################################################################################ -# Play Store actual version (16/03/15): 11 -ANDROID_VERSION_CODE = 12 + +ANDROID_VERSION_CODE = 1 ################################################################################ # toolchain config for arm old processors diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp index 5307ccd4b..4b51ecf49 100644 --- a/src/client/clientlauncher.cpp +++ b/src/client/clientlauncher.cpp @@ -183,7 +183,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args) { // Set the window caption const wchar_t *text = wgettext("Main Menu"); - device->setWindowCaption((narrow_to_wide(PROJECT_NAME) + L" [" + text + L"]").c_str()); + device->setWindowCaption((narrow_to_wide("MultiCraft") + L" [" + text + L"]").c_str()); delete[] text; try { // This is used for catching disconnects diff --git a/src/game.cpp b/src/game.cpp index 09ffb164f..33e01c5cd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2035,7 +2035,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("MultiCraft"); str += L" ["; str += driver->getName(); str += L"]"; @@ -2060,7 +2060,7 @@ bool Game::initGui() { // First line of debug text guitext = guienv->addStaticText( - narrow_to_wide(PROJECT_NAME).c_str(), + narrow_to_wide("MultiCraft").c_str(), core::rect(0, 0, 0, 0), false, false, guiroot); @@ -4034,7 +4034,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 + << "MultiCraft " << g_version_hash << " FPS = " << fps << " (R: range_all=" << draw_control->range_all << ")" << std::setprecision(0) @@ -4050,7 +4050,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 << "MultiCraft " << g_version_hash; guitext->setText(narrow_to_wide(os.str()).c_str()); guitext->setVisible(true); } else { @@ -4283,7 +4283,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 MultiCraft."; errorstream << error_message << std::endl; } catch (ServerError &e) { error_message = e.what(); diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index 6989ffa35..4ef9a0645 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -172,7 +172,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_sound_manager = &dummySoundManager; //create topleft header - std::wstring t = narrow_to_wide(std::string(PROJECT_NAME " ") + + std::wstring t = narrow_to_wide(std::string("MultiCraft ") + g_version_hash); core::rect rect(0, 0, g_fontengine->getTextWidth(t), g_fontengine->getTextHeight());