Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SNOWCRAFT + Fix build

Browse Source
This commit is contained in:
Maksim Gamarnik 2015-12-06 14:27:27 +02:00
parent 5137cfb690
commit d31f8dfcb8
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.h
View File

@ -13,8 +13,8 @@
#if defined USE_CMAKE_CONFIG_H #if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h" #include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID) #elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "MultiCraft" #define PROJECT_NAME "SnowCraft"
#define PROJECT_NAME_C "MultiCraft" #define PROJECT_NAME_C "SnowCraft"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#include "android_version.h" #include "android_version.h"
#ifdef NDEBUG #ifdef NDEBUG

4
src/defaultsettings.cpp
View File

@ -308,8 +308,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("liquid_update", "1.0"); settings->setDefault("liquid_update", "1.0");
//mapgen stuff //mapgen stuff
//settings->setDefault("mg_name", "v7"); settings->setDefault("mg_name", "v7");
settings->setDefault("mg_name", "v6"); //settings->setDefault("mg_name", "v6");
settings->setDefault("water_level", "1"); settings->setDefault("water_level", "1");
settings->setDefault("chunksize", "5"); settings->setDefault("chunksize", "5");
settings->setDefault("mg_flags", "dungeons"); settings->setDefault("mg_flags", "dungeons");

12
src/drawscene.cpp
View File

@ -431,12 +431,12 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr,
bool draw_crosshair = ((player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) && bool draw_crosshair = ((player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
(camera.getCameraMode() != CAMERA_MODE_THIRD_FRONT)); (camera.getCameraMode() != CAMERA_MODE_THIRD_FRONT));
#ifdef HAVE_TOUCHSCREENGUI //#ifdef HAVE_TOUCHSCREENGUI
try { // try {
draw_crosshair = !g_settings->getBool("touchtarget"); // draw_crosshair = !g_settings->getBool("touchtarget");
} // }
catch(SettingNotFoundException) {} // catch(SettingNotFoundException) {}
#endif //#endif
std::string draw_mode = g_settings->get("3d_mode"); std::string draw_mode = g_settings->get("3d_mode");

7
src/game.cpp
View File

@ -1141,12 +1141,12 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
<< strgettext("Sound Volume") << "]"; << strgettext("Sound Volume") << "]";
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;" os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
<< strgettext("Change Keys") << "]"; << strgettext("Change Keys") << "]";
#endif
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;" os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< strgettext("Exit to Menu") << "]"; << strgettext("Exit to Menu") << "]";
//#endif #endif
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;" os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
<< strgettext("Exit to OS") << "]" << strgettext("Exit") << "]"
#ifndef __ANDROID__
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]" << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n" << "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
<< g_build_info << "\n" << g_build_info << "\n"
@ -2636,6 +2636,7 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) { if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) {
dropSelectedItem(); dropSelectedItem();
// Add WoW-style autorun by toggling continuous forward.
} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) { } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) {
toggleAutorun(statustext_time); toggleAutorun(statustext_time);
} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) { } else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) {

3
src/script/cpp_api/s_player.cpp
View File

@ -194,6 +194,3 @@ ScriptApiPlayer::~ScriptApiPlayer()
{ {
} }
ScriptApiPlayer::~ScriptApiPlayer()
{
}