X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.cpp;h=12fe6a6e9480b6ecfb73ec25755379ed7de2cf2f;hb=9762650f978cc7bae78861b70a051b26cc5e2dc6;hp=c84e08b01d8cc20d64d453774e717975bd9ce41e;hpb=c42c53fccf87a3819ca78de52f8f20c47c4fbb9f;p=minetest.git diff --git a/src/game.cpp b/src/game.cpp index c84e08b01..12fe6a6e9 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "version.h" #include "minimap.h" #include "mapblock_mesh.h" -#include "script/clientscripting.h" +#include "script/scripting_client.h" #include "sound.h" @@ -79,14 +79,15 @@ extern Profiler *g_profiler; Text input system */ -struct TextDestNodeMetadata : public TextDest { +struct TextDestNodeMetadata : public TextDest +{ TextDestNodeMetadata(v3s16 p, Client *client) { m_p = p; m_client = client; } // This is deprecated I guess? -celeron55 - void gotText(std::wstring text) + void gotText(const std::wstring &text) { std::string ntext = wide_to_utf8(text); infostream << "Submitting 'text' field of node at (" << m_p.X << "," @@ -104,13 +105,14 @@ struct TextDestNodeMetadata : public TextDest { Client *m_client; }; -struct TextDestPlayerInventory : public TextDest { +struct TextDestPlayerInventory : public TextDest +{ TextDestPlayerInventory(Client *client) { m_client = client; m_formname = ""; } - TextDestPlayerInventory(Client *client, std::string formname) + TextDestPlayerInventory(Client *client, const std::string &formname) { m_client = client; m_formname = formname; @@ -123,26 +125,20 @@ struct TextDestPlayerInventory : public TextDest { Client *m_client; }; -struct LocalFormspecHandler : public TextDest { - LocalFormspecHandler(); - - LocalFormspecHandler(std::string formname) : - m_client(0) +struct LocalFormspecHandler : public TextDest +{ + LocalFormspecHandler(const std::string &formname): + m_client(NULL) { m_formname = formname; } - LocalFormspecHandler(std::string formname, Client *client) : + LocalFormspecHandler(const std::string &formname, Client *client): m_client(client) { m_formname = formname; } - void gotText(std::wstring message) - { - errorstream << "LocalFormspecHandler::gotText old style message received" << std::endl; - } - void gotText(const StringMap &fields) { if (m_formname == "MT_PAUSE_MENU") { @@ -179,6 +175,8 @@ struct LocalFormspecHandler : public TextDest { return; } } + + // Don't disable this part when modding is disabled, it's used in builtin m_client->getScript()->on_formspec_input(m_formname, fields); } @@ -204,7 +202,8 @@ class NodeMetadataFormSource: public IFormSource return meta->getString("formspec"); } - std::string resolveText(std::string str) + + virtual std::string resolveText(const std::string &str) { NodeMetadata *meta = m_map->getNodeMetadata(m_p); @@ -568,27 +567,35 @@ class SoundMaker class GameOnDemandSoundFetcher: public OnDemandSoundFetcher { std::set m_fetched; +private: + void paths_insert(std::set &dst_paths, + const std::string &base, + const std::string &name) + { + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".0.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".1.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".2.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".3.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".4.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".5.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".6.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".7.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".8.ogg"); + dst_paths.insert(base + DIR_DELIM + "sounds" + DIR_DELIM + name + ".9.ogg"); + } public: void fetchSounds(const std::string &name, - std::set &dst_paths, - std::set &dst_datas) + std::set &dst_paths, + std::set &dst_datas) { if (m_fetched.count(name)) return; m_fetched.insert(name); - std::string base = porting::path_share + DIR_DELIM + "sounds"; - dst_paths.insert(base + DIR_DELIM + name + ".ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".0.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".1.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".2.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".3.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".4.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".5.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".6.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".7.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".8.ogg"); - dst_paths.insert(base + DIR_DELIM + name + ".9.ogg"); + + paths_insert(dst_paths, porting::path_share, name); + paths_insert(dst_paths, porting::path_user, name); } }; @@ -713,7 +720,7 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter m_eye_position_vertex.set(eye_position_array, services); float minimap_yaw_array[3]; - v3f minimap_yaw = m_client->getMapper()->getYawVec(); + v3f minimap_yaw = m_client->getMinimap()->getYawVec(); #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8) minimap_yaw_array[0] = minimap_yaw.X; minimap_yaw_array[1] = minimap_yaw.Y; @@ -925,81 +932,6 @@ static inline void create_formspec_menu(GUIFormSpecMenu **cur_formspec, #define SIZE_TAG "size[11,5.5,true]" // Fixed size on desktop #endif -/******************************************************************************/ -static void show_pause_menu(GUIFormSpecMenu **cur_formspec, - Client *client, - IWritableTextureSource *tsrc, IrrlichtDevice *device, - JoystickController *joystick, bool singleplayermode) -{ -#ifdef __ANDROID__ - std::string control_text = strgettext("Default Controls:\n" - "No menu visible:\n" - "- single tap: button activate\n" - "- double tap: place/use\n" - "- slide finger: look around\n" - "Menu/Inventory visible:\n" - "- double tap (outside):\n" - " -->close\n" - "- touch stack, touch slot:\n" - " --> move stack\n" - "- touch&drag, tap 2nd finger\n" - " --> place single item to slot\n" - ); -#else - std::string control_text = strgettext("Default Controls:\n" - "- WASD: move\n" - "- Space: jump/climb\n" - "- Shift: sneak/go down\n" - "- Q: drop item\n" - "- I: inventory\n" - "- Mouse: turn/look\n" - "- Mouse left: dig/punch\n" - "- Mouse right: place/use\n" - "- Mouse wheel: select item\n" - "- T: chat\n" - ); -#endif - - float ypos = singleplayermode ? 0.5 : 0.1; - std::ostringstream os; - - os << FORMSPEC_VERSION_STRING << SIZE_TAG - << "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;" - << strgettext("Continue") << "]"; - - if (!singleplayermode) { - os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;" - << strgettext("Change Password") << "]"; - } - -#ifndef __ANDROID__ - os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;" - << strgettext("Sound Volume") << "]"; - os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;" - << strgettext("Change Keys") << "]"; -#endif - os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;" - << strgettext("Exit to Menu") << "]"; - os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;" - << strgettext("Exit to OS") << "]" - << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]" - << "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;]"; - - /* Create menu */ - /* Note: FormspecFormSource and LocalFormspecHandler * - * are deleted by guiFormSpecMenu */ - FormspecFormSource *fs_src = new FormspecFormSource(os.str()); - LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_PAUSE_MENU"); - - create_formspec_menu(cur_formspec, client, device, joystick, fs_src, txt_dst); - std::string con("btn_continue"); - (*cur_formspec)->setFocus(con); - (*cur_formspec)->doPause = true; -} - /******************************************************************************/ static void updateChat(Client &client, f32 dtime, bool show_debug, const v2u32 &screensize, bool show_chat, u32 show_profiler, @@ -1108,6 +1040,7 @@ void KeyCache::populate() key[KeyType::INVENTORY] = getKeySetting("keymap_inventory"); key[KeyType::CHAT] = getKeySetting("keymap_chat"); key[KeyType::CMD] = getKeySetting("keymap_cmd"); + key[KeyType::CMD_LOCAL] = getKeySetting("keymap_cmd_local"); key[KeyType::CONSOLE] = getKeySetting("keymap_console"); key[KeyType::MINIMAP] = getKeySetting("keymap_minimap"); key[KeyType::FREEMOVE] = getKeySetting("keymap_freemove"); @@ -1184,6 +1117,7 @@ struct GameRunData { PointedThing pointed_old; bool digging; bool ldown_for_dig; + bool dig_instantly; bool left_punch; bool update_wielded_item_trigger; bool reset_jump_timer; @@ -1217,28 +1151,10 @@ struct Jitter { struct RunStats { u32 drawtime; - u32 beginscenetime; - u32 endscenetime; Jitter dtime_jitter, busy_time_jitter; }; -/* Flags that can, or may, change during main game loop - */ -struct VolatileRunFlags { - bool invert_mouse; - bool show_chat; - bool show_hud; - bool show_minimap; - bool force_fog_off; - bool show_debug; - bool show_profiler_graph; - bool disable_camera_update; - bool first_loop_after_window_activation; - bool camera_offset_changed; -}; - - /**************************************************************************** THE GAME ****************************************************************************/ @@ -1281,7 +1197,7 @@ class Game { u16 port, const SubgameSpec &gamespec); bool initSound(); - bool createSingleplayerServer(const std::string map_dir, + bool createSingleplayerServer(const std::string &map_dir, const SubgameSpec &gamespec, u16 port, std::string *address); // Client creation @@ -1297,64 +1213,49 @@ class Game { // Main loop - void updateInteractTimers(GameRunData *runData, f32 dtime); + void updateInteractTimers(f32 dtime); bool checkConnection(); bool handleCallbacks(); void processQueues(); - void updateProfilers(const GameRunData &runData, const RunStats &stats, - const FpsControl &draw_times, f32 dtime); - void addProfilerGraphs(const RunStats &stats, const FpsControl &draw_times, - f32 dtime); + void updateProfilers(const RunStats &stats, const FpsControl &draw_times, f32 dtime); + void addProfilerGraphs(const RunStats &stats, const FpsControl &draw_times, f32 dtime); void updateStats(RunStats *stats, const FpsControl &draw_times, f32 dtime); // Input related - void processUserInput(VolatileRunFlags *flags, GameRunData *runData, - f32 dtime); - void processKeyInput(VolatileRunFlags *flags, - float *statustext_time, - float *jump_timer, - bool *reset_jump_timer, - u32 *profiler_current_page, - u32 profiler_max_page); + void processUserInput(f32 dtime); + void processKeyInput(); void processItemSelection(u16 *new_playeritem); void dropSelectedItem(); void openInventory(); void openConsole(float scale, const wchar_t *line=NULL); - void toggleFreeMove(float *statustext_time); - void toggleFreeMoveAlt(float *statustext_time, float *jump_timer); - void toggleFast(float *statustext_time); - void toggleNoClip(float *statustext_time); - void toggleCinematic(float *statustext_time); - void toggleAutorun(float *statustext_time); - - void toggleChat(float *statustext_time, bool *flag); - void toggleHud(float *statustext_time, bool *flag); - void toggleMinimap(float *statustext_time, bool *flag, bool show_hud, - bool shift_pressed); - void toggleFog(float *statustext_time, bool *flag); - void toggleDebug(float *statustext_time, bool *show_debug, - bool *show_profiler_graph, bool *show_wireframe); - void toggleUpdateCamera(float *statustext_time, bool *flag); - void toggleProfiler(float *statustext_time, u32 *profiler_current_page, - u32 profiler_max_page); - - void increaseViewRange(float *statustext_time); - void decreaseViewRange(float *statustext_time); - void toggleFullViewRange(float *statustext_time); - - void updateCameraDirection(CameraOrientation *cam, VolatileRunFlags *flags, - float dtime); - void updateCameraOrientation(CameraOrientation *cam, - const VolatileRunFlags &flags, float dtime); + void toggleFreeMove(); + void toggleFreeMoveAlt(); + void toggleFast(); + void toggleNoClip(); + void toggleCinematic(); + void toggleAutorun(); + + void toggleChat(); + void toggleHud(); + void toggleMinimap(bool shift_pressed); + void toggleFog(); + void toggleDebug(); + void toggleUpdateCamera(); + void toggleProfiler(); + + void increaseViewRange(); + void decreaseViewRange(); + void toggleFullViewRange(); + + void updateCameraDirection(CameraOrientation *cam, float dtime); + void updateCameraOrientation(CameraOrientation *cam, float dtime); void updatePlayerControl(const CameraOrientation &cam); void step(f32 *dtime); - void processClientEvents(CameraOrientation *cam, float *damage_flash); - void updateCamera(VolatileRunFlags *flags, u32 busy_time, f32 dtime, - float time_from_last_punch); + void processClientEvents(CameraOrientation *cam); + void updateCamera(u32 busy_time, f32 dtime); void updateSound(f32 dtime); - void processPlayerInteraction(GameRunData *runData, f32 dtime, bool show_hud, - bool show_debug); + void processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug); /*! * Returns the object or node the player is pointing at. * Also updates the selected thing in the Hud. @@ -1370,23 +1271,17 @@ class Game { */ PointedThing updatePointedThing( const core::line3d &shootline, bool liquids_pointable, - bool look_for_object, const v3s16 &camera_offset, - ClientActiveObject *&selected_object); - void handlePointingAtNothing(GameRunData *runData, const ItemStack &playerItem); - void handlePointingAtNode(GameRunData *runData, - const PointedThing &pointed, const ItemDefinition &playeritem_def, + bool look_for_object, const v3s16 &camera_offset); + void handlePointingAtNothing(const ItemStack &playerItem); + void handlePointingAtNode(const PointedThing &pointed, const ItemDefinition &playeritem_def, const ToolCapabilities &playeritem_toolcap, f32 dtime); - void handlePointingAtObject(GameRunData *runData, - const PointedThing &pointed, const ItemStack &playeritem, + void handlePointingAtObject(const PointedThing &pointed, const ItemStack &playeritem, const v3f &player_position, bool show_debug); - void handleDigging(GameRunData *runData, const PointedThing &pointed, - const v3s16 &nodepos, const ToolCapabilities &playeritem_toolcap, - f32 dtime); - void updateFrame(ProfilerGraph *graph, RunStats *stats, GameRunData *runData, - f32 dtime, const VolatileRunFlags &flags, const CameraOrientation &cam); - void updateGui(float *statustext_time, const RunStats &stats, - const GameRunData& runData, f32 dtime, const VolatileRunFlags &flags, + void handleDigging(const PointedThing &pointed, const v3s16 &nodepos, + const ToolCapabilities &playeritem_toolcap, f32 dtime); + void updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime, const CameraOrientation &cam); + void updateGui(const RunStats &stats, f32 dtime, const CameraOrientation &cam); void updateProfilerGraphs(ProfilerGraph *graph); // Misc @@ -1438,6 +1333,8 @@ class Game { #endif private: + void showPauseMenu(); + InputHandler *input; Client *client; @@ -1471,10 +1368,10 @@ class Game { Sky *sky; // Free using ->Drop() Inventory *local_inventory; Hud *hud; - Mapper *mapper; + Minimap *mapper; GameRunData runData; - VolatileRunFlags flags; + GameUIFlags flags; /* 'cache' This class does take ownership/responsibily for cleaning up etc of any of @@ -1506,7 +1403,7 @@ class Game { gui::IGUIStaticText *guitext_profiler; // Profiler text std::wstring infotext; - std::wstring statustext; + std::wstring m_statustext; KeyCache keycache; @@ -1531,6 +1428,10 @@ class Game { f32 m_cache_cam_smoothing; f32 m_cache_fog_start; + bool m_invert_mouse; + bool m_first_loop_after_window_activation; + bool m_camera_offset_changed; + #ifdef __ANDROID__ bool m_cache_hold_aux1; bool m_android_chat_open; @@ -1559,7 +1460,10 @@ Game::Game() : sky(NULL), local_inventory(NULL), hud(NULL), - mapper(NULL) + mapper(NULL), + m_invert_mouse(false), + m_first_loop_after_window_activation(false), + m_camera_offset_changed(false) { g_settings->registerChangedCallback("doubletap_jump", &settingChangedCallback, this); @@ -1690,8 +1594,8 @@ bool Game::startup(bool *kill, flags.show_chat = true; flags.show_hud = true; flags.show_debug = g_settings->getBool("show_debug"); - flags.invert_mouse = g_settings->getBool("invert_mouse"); - flags.first_loop_after_window_activation = true; + m_invert_mouse = g_settings->getBool("invert_mouse"); + m_first_loop_after_window_activation = true; if (!init(map_dir, address, port, gamespec)) return false; @@ -1735,7 +1639,7 @@ void Game::run() limitFps(&draw_times, &dtime); updateStats(&stats, draw_times, dtime); - updateInteractTimers(&runData, dtime); + updateInteractTimers(dtime); if (!checkConnection()) break; @@ -1747,27 +1651,25 @@ void Game::run() infotext = L""; hud->resizeHotbar(); - updateProfilers(runData, stats, draw_times, dtime); - processUserInput(&flags, &runData, dtime); + updateProfilers(stats, draw_times, dtime); + processUserInput(dtime); // Update camera before player movement to avoid camera lag of one frame - updateCameraDirection(&cam_view_target, &flags, dtime); + updateCameraDirection(&cam_view_target, dtime); cam_view.camera_yaw += (cam_view_target.camera_yaw - cam_view.camera_yaw) * m_cache_cam_smoothing; cam_view.camera_pitch += (cam_view_target.camera_pitch - cam_view.camera_pitch) * m_cache_cam_smoothing; updatePlayerControl(cam_view); step(&dtime); - processClientEvents(&cam_view_target, &runData.damage_flash); - updateCamera(&flags, draw_times.busy_time, dtime, - runData.time_from_last_punch); + processClientEvents(&cam_view_target); + updateCamera(draw_times.busy_time, dtime); updateSound(dtime); - processPlayerInteraction(&runData, dtime, flags.show_hud, - flags.show_debug); - updateFrame(&graph, &stats, &runData, dtime, flags, cam_view); + processPlayerInteraction(dtime, flags.show_hud, flags.show_debug); + updateFrame(&graph, &stats, dtime, cam_view); updateProfilerGraphs(&graph); // Update if minimap has been disabled by the server - flags.show_minimap &= !client->isMinimapDisabledByServer(); + flags.show_minimap &= client->shouldShowMinimap(); } } @@ -1830,9 +1732,10 @@ bool Game::init( u16 port, const SubgameSpec &gamespec) { + texture_src = createTextureSource(device); + showOverlayMessage(wgettext("Loading..."), 0, 0); - texture_src = createTextureSource(device); shader_src = createShaderSource(device); itemdef_manager = createItemDefManager(); @@ -1884,7 +1787,7 @@ bool Game::initSound() return true; } -bool Game::createSingleplayerServer(const std::string map_dir, +bool Game::createSingleplayerServer(const std::string &map_dir, const SubgameSpec &gamespec, u16 port, std::string *address) { showOverlayMessage(wgettext("Creating server..."), 0, 5); @@ -1913,7 +1816,7 @@ bool Game::createSingleplayerServer(const std::string map_dir, } server = new Server(map_dir, gamespec, simple_singleplayer_mode, - bind_addr.isIPv6()); + bind_addr.isIPv6(), false); server->start(bind_addr); @@ -2027,7 +1930,7 @@ bool Game::createClient(const std::string &playername, return false; } - mapper = client->getMapper(); + mapper = client->getMinimap(); mapper->setMinimapMode(MINIMAP_MODE_OFF); return true; @@ -2144,7 +2047,7 @@ bool Game::connectToServer(const std::string &playername, playername.c_str(), password, *draw_control, texture_src, shader_src, itemdef_manager, nodedef_manager, sound, eventmgr, - connect_address.isIPv6()); + connect_address.isIPv6(), &flags); if (!client) return false; @@ -2288,17 +2191,21 @@ bool Game::getServerContent(bool *aborted) if (!client->itemdefReceived()) { const wchar_t *text = wgettext("Item definitions..."); progress = 25; - draw_load_screen(text, device, guienv, dtime, progress); + draw_load_screen(text, device, guienv, texture_src, + dtime, progress); delete[] text; } else if (!client->nodedefReceived()) { const wchar_t *text = wgettext("Node definitions..."); progress = 30; - draw_load_screen(text, device, guienv, dtime, progress); + draw_load_screen(text, device, guienv, texture_src, + dtime, progress); delete[] text; } else { std::stringstream message; - message.precision(3); - message << gettext("Media..."); + std::fixed(message); + message.precision(0); + message << gettext("Media...") << " " << (client->mediaReceiveProgress()*100) << "%"; + message.precision(2); if ((USE_CURL == 0) || (!g_settings->getBool("enable_remote_media_server"))) { @@ -2315,7 +2222,7 @@ bool Game::getServerContent(bool *aborted) progress = 30 + client->mediaReceiveProgress() * 35 + 0.5; draw_load_screen(utf8_to_wide(message.str()), device, - guienv, dtime, progress); + guienv, texture_src, dtime, progress); } } @@ -2329,15 +2236,15 @@ bool Game::getServerContent(bool *aborted) ****************************************************************************/ /****************************************************************************/ -inline void Game::updateInteractTimers(GameRunData *runData, f32 dtime) +inline void Game::updateInteractTimers(f32 dtime) { - if (runData->nodig_delay_timer >= 0) - runData->nodig_delay_timer -= dtime; + if (runData.nodig_delay_timer >= 0) + runData.nodig_delay_timer -= dtime; - if (runData->object_hit_delay_timer >= 0) - runData->object_hit_delay_timer -= dtime; + if (runData.object_hit_delay_timer >= 0) + runData.object_hit_delay_timer -= dtime; - runData->time_from_last_punch += dtime; + runData.time_from_last_punch += dtime; } @@ -2401,8 +2308,7 @@ void Game::processQueues() } -void Game::updateProfilers(const GameRunData &runData, const RunStats &stats, - const FpsControl &draw_times, f32 dtime) +void Game::updateProfilers(const RunStats &stats, const FpsControl &draw_times, f32 dtime) { float profiler_print_interval = g_settings->getFloat("profiler_print_interval"); @@ -2500,13 +2406,10 @@ void Game::updateStats(RunStats *stats, const FpsControl &draw_times, Input handling ****************************************************************************/ -void Game::processUserInput(VolatileRunFlags *flags, - GameRunData *runData, f32 dtime) +void Game::processUserInput(f32 dtime) { // Reset input if window not active or some menu is active - if (device->isWindowActive() == false - || noMenuActive() == false - || guienv->hasFocus(gui_chat_console)) { + if (!device->isWindowActive() || !noMenuActive() || guienv->hasFocus(gui_chat_console)) { input->clear(); #ifdef HAVE_TOUCHSCREENGUI g_touchscreengui->hide(); @@ -2535,85 +2438,66 @@ void Game::processUserInput(VolatileRunFlags *flags, #endif // Increase timer for double tap of "keymap_jump" - if (m_cache_doubletap_jump && runData->jump_timer <= 0.2) - runData->jump_timer += dtime; - - processKeyInput( - flags, - &runData->statustext_time, - &runData->jump_timer, - &runData->reset_jump_timer, - &runData->profiler_current_page, - runData->profiler_max_page); - - processItemSelection(&runData->new_playeritem); + if (m_cache_doubletap_jump && runData.jump_timer <= 0.2f) + runData.jump_timer += dtime; + + processKeyInput(); + processItemSelection(&runData.new_playeritem); } -void Game::processKeyInput(VolatileRunFlags *flags, - float *statustext_time, - float *jump_timer, - bool *reset_jump_timer, - u32 *profiler_current_page, - u32 profiler_max_page) +void Game::processKeyInput() { - - //TimeTaker tt("process kybd input", NULL, PRECISION_NANO); - if (wasKeyDown(KeyType::DROP)) { dropSelectedItem(); } else if (wasKeyDown(KeyType::AUTORUN)) { - toggleAutorun(statustext_time); + toggleAutorun(); } else if (wasKeyDown(KeyType::INVENTORY)) { openInventory(); } else if (wasKeyDown(KeyType::ESC) || input->wasKeyDown(CancelKey)) { if (!gui_chat_console->isOpenInhibited()) { - show_pause_menu(¤t_formspec, client, - texture_src, device, &input->joystick, - simple_singleplayer_mode); + showPauseMenu(); } } else if (wasKeyDown(KeyType::CHAT)) { openConsole(0.2, L""); } else if (wasKeyDown(KeyType::CMD)) { openConsole(0.2, L"/"); + } else if (wasKeyDown(KeyType::CMD_LOCAL)) { + openConsole(0.2, L"."); } else if (wasKeyDown(KeyType::CONSOLE)) { - openConsole(core::clamp( - g_settings->getFloat("console_height"), 0.1f, 1.0f)); + openConsole(core::clamp(g_settings->getFloat("console_height"), 0.1f, 1.0f)); } else if (wasKeyDown(KeyType::FREEMOVE)) { - toggleFreeMove(statustext_time); + toggleFreeMove(); } else if (wasKeyDown(KeyType::JUMP)) { - toggleFreeMoveAlt(statustext_time, jump_timer); - *reset_jump_timer = true; + toggleFreeMoveAlt(); } else if (wasKeyDown(KeyType::FASTMOVE)) { - toggleFast(statustext_time); + toggleFast(); } else if (wasKeyDown(KeyType::NOCLIP)) { - toggleNoClip(statustext_time); + toggleNoClip(); } else if (wasKeyDown(KeyType::CINEMATIC)) { - toggleCinematic(statustext_time); + toggleCinematic(); } else if (wasKeyDown(KeyType::SCREENSHOT)) { client->makeScreenshot(device); } else if (wasKeyDown(KeyType::TOGGLE_HUD)) { - toggleHud(statustext_time, &flags->show_hud); + toggleHud(); } else if (wasKeyDown(KeyType::MINIMAP)) { - toggleMinimap(statustext_time, &flags->show_minimap, flags->show_hud, - isKeyDown(KeyType::SNEAK)); + toggleMinimap(isKeyDown(KeyType::SNEAK)); } else if (wasKeyDown(KeyType::TOGGLE_CHAT)) { - toggleChat(statustext_time, &flags->show_chat); + toggleChat(); } else if (wasKeyDown(KeyType::TOGGLE_FORCE_FOG_OFF)) { - toggleFog(statustext_time, &flags->force_fog_off); + toggleFog(); } else if (wasKeyDown(KeyType::TOGGLE_UPDATE_CAMERA)) { - toggleUpdateCamera(statustext_time, &flags->disable_camera_update); + toggleUpdateCamera(); } else if (wasKeyDown(KeyType::TOGGLE_DEBUG)) { - toggleDebug(statustext_time, &flags->show_debug, &flags->show_profiler_graph, - &draw_control->show_wireframe); + toggleDebug(); } else if (wasKeyDown(KeyType::TOGGLE_PROFILER)) { - toggleProfiler(statustext_time, profiler_current_page, profiler_max_page); + toggleProfiler(); } else if (wasKeyDown(KeyType::INCREASE_VIEWING_RANGE)) { - increaseViewRange(statustext_time); + increaseViewRange(); } else if (wasKeyDown(KeyType::DECREASE_VIEWING_RANGE)) { - decreaseViewRange(statustext_time); + decreaseViewRange(); } else if (wasKeyDown(KeyType::RANGESELECT)) { - toggleFullViewRange(statustext_time); + toggleFullViewRange(); } else if (wasKeyDown(KeyType::QUICKTUNE_NEXT)) { quicktune->next(); } else if (wasKeyDown(KeyType::QUICKTUNE_PREV)) { @@ -2632,17 +2516,14 @@ void Game::processKeyInput(VolatileRunFlags *flags, debug_stacks_print(); } - if (!isKeyDown(KeyType::JUMP) && *reset_jump_timer) { - *reset_jump_timer = false; - *jump_timer = 0.0; + if (!isKeyDown(KeyType::JUMP) && runData.reset_jump_timer) { + runData.reset_jump_timer = false; + runData.jump_timer = 0.0f; } - //tt.stop(); - if (quicktune->hasMessage()) { - std::string msg = quicktune->getMessage(); - statustext = utf8_to_wide(msg); - *statustext_time = 0; + m_statustext = utf8_to_wide(quicktune->getMessage()); + runData.statustext_time = 0.0f; } } @@ -2759,40 +2640,42 @@ void Game::handleAndroidChatInput() #endif -void Game::toggleFreeMove(float *statustext_time) +void Game::toggleFreeMove() { static const wchar_t *msg[] = { L"free_move disabled", L"free_move enabled" }; bool free_move = !g_settings->getBool("free_move"); g_settings->set("free_move", bool_to_cstr(free_move)); - *statustext_time = 0; - statustext = msg[free_move]; + runData.statustext_time = 0; + m_statustext = msg[free_move]; if (free_move && !client->checkPrivilege("fly")) - statustext += L" (note: no 'fly' privilege)"; + m_statustext += L" (note: no 'fly' privilege)"; } -void Game::toggleFreeMoveAlt(float *statustext_time, float *jump_timer) +void Game::toggleFreeMoveAlt() { - if (m_cache_doubletap_jump && *jump_timer < 0.2f) - toggleFreeMove(statustext_time); + if (m_cache_doubletap_jump && runData.jump_timer < 0.2f) + toggleFreeMove(); + + runData.reset_jump_timer = true; } -void Game::toggleFast(float *statustext_time) +void Game::toggleFast() { static const wchar_t *msg[] = { L"fast_move disabled", L"fast_move enabled" }; bool fast_move = !g_settings->getBool("fast_move"); g_settings->set("fast_move", bool_to_cstr(fast_move)); - *statustext_time = 0; - statustext = msg[fast_move]; + runData.statustext_time = 0; + m_statustext = msg[fast_move]; bool has_fast_privs = client->checkPrivilege("fast"); if (fast_move && !has_fast_privs) - statustext += L" (note: no 'fast' privilege)"; + m_statustext += L" (note: no 'fast' privilege)"; #ifdef __ANDROID__ m_cache_hold_aux1 = fast_move && has_fast_privs; @@ -2800,63 +2683,62 @@ void Game::toggleFast(float *statustext_time) } -void Game::toggleNoClip(float *statustext_time) +void Game::toggleNoClip() { static const wchar_t *msg[] = { L"noclip disabled", L"noclip enabled" }; bool noclip = !g_settings->getBool("noclip"); g_settings->set("noclip", bool_to_cstr(noclip)); - *statustext_time = 0; - statustext = msg[noclip]; + runData.statustext_time = 0; + m_statustext = msg[noclip]; if (noclip && !client->checkPrivilege("noclip")) - statustext += L" (note: no 'noclip' privilege)"; + m_statustext += L" (note: no 'noclip' privilege)"; } -void Game::toggleCinematic(float *statustext_time) +void Game::toggleCinematic() { static const wchar_t *msg[] = { L"cinematic disabled", L"cinematic enabled" }; bool cinematic = !g_settings->getBool("cinematic"); g_settings->set("cinematic", bool_to_cstr(cinematic)); - *statustext_time = 0; - statustext = msg[cinematic]; + runData.statustext_time = 0; + m_statustext = msg[cinematic]; } // Add WoW-style autorun by toggling continuous forward. -void Game::toggleAutorun(float *statustext_time) +void Game::toggleAutorun() { static const wchar_t *msg[] = { L"autorun disabled", L"autorun enabled" }; bool autorun_enabled = !g_settings->getBool("continuous_forward"); g_settings->set("continuous_forward", bool_to_cstr(autorun_enabled)); - *statustext_time = 0; - statustext = msg[autorun_enabled ? 1 : 0]; + runData.statustext_time = 0; + m_statustext = msg[autorun_enabled ? 1 : 0]; } -void Game::toggleChat(float *statustext_time, bool *flag) +void Game::toggleChat() { static const wchar_t *msg[] = { L"Chat hidden", L"Chat shown" }; - *flag = !*flag; - *statustext_time = 0; - statustext = msg[*flag]; + flags.show_chat = !flags.show_chat; + runData.statustext_time = 0; + m_statustext = msg[flags.show_chat]; } -void Game::toggleHud(float *statustext_time, bool *flag) +void Game::toggleHud() { static const wchar_t *msg[] = { L"HUD hidden", L"HUD shown" }; - *flag = !*flag; - *statustext_time = 0; - statustext = msg[*flag]; + flags.show_hud = !flags.show_hud; + runData.statustext_time = 0; + m_statustext = msg[flags.show_hud]; } -void Game::toggleMinimap(float *statustext_time, bool *flag, - bool show_hud, bool shift_pressed) +void Game::toggleMinimap(bool shift_pressed) { - if (!show_hud || !g_settings->getBool("enable_minimap")) + if (!flags.show_hud || !g_settings->getBool("enable_minimap")) return; if (shift_pressed) { @@ -2872,151 +2754,150 @@ void Game::toggleMinimap(float *statustext_time, bool *flag, mode = (MinimapMode)((int)mode + 1); } - *flag = true; + flags.show_minimap = true; switch (mode) { case MINIMAP_MODE_SURFACEx1: - statustext = L"Minimap in surface mode, Zoom x1"; + m_statustext = L"Minimap in surface mode, Zoom x1"; break; case MINIMAP_MODE_SURFACEx2: - statustext = L"Minimap in surface mode, Zoom x2"; + m_statustext = L"Minimap in surface mode, Zoom x2"; break; case MINIMAP_MODE_SURFACEx4: - statustext = L"Minimap in surface mode, Zoom x4"; + m_statustext = L"Minimap in surface mode, Zoom x4"; break; case MINIMAP_MODE_RADARx1: - statustext = L"Minimap in radar mode, Zoom x1"; + m_statustext = L"Minimap in radar mode, Zoom x1"; break; case MINIMAP_MODE_RADARx2: - statustext = L"Minimap in radar mode, Zoom x2"; + m_statustext = L"Minimap in radar mode, Zoom x2"; break; case MINIMAP_MODE_RADARx4: - statustext = L"Minimap in radar mode, Zoom x4"; + m_statustext = L"Minimap in radar mode, Zoom x4"; break; default: mode = MINIMAP_MODE_OFF; - *flag = false; - statustext = (hud_flags & HUD_FLAG_MINIMAP_VISIBLE) ? + flags.show_minimap = false; + m_statustext = (hud_flags & HUD_FLAG_MINIMAP_VISIBLE) ? L"Minimap hidden" : L"Minimap disabled by server"; } - *statustext_time = 0; + runData.statustext_time = 0; mapper->setMinimapMode(mode); } -void Game::toggleFog(float *statustext_time, bool *flag) +void Game::toggleFog() { static const wchar_t *msg[] = { L"Fog enabled", L"Fog disabled" }; - *flag = !*flag; - *statustext_time = 0; - statustext = msg[*flag]; + flags.force_fog_off = !flags.force_fog_off; + runData.statustext_time = 0; + m_statustext = msg[flags.force_fog_off]; } -void Game::toggleDebug(float *statustext_time, bool *show_debug, - bool *show_profiler_graph, bool *show_wireframe) +void Game::toggleDebug() { // Initial / 4x toggle: Chat only // 1x toggle: Debug text with chat // 2x toggle: Debug text with profiler graph // 3x toggle: Debug text and wireframe - if (!*show_debug) { - *show_debug = true; - *show_profiler_graph = false; - *show_wireframe = false; - statustext = L"Debug info shown"; - } else if (!*show_profiler_graph && !*show_wireframe) { - *show_profiler_graph = true; - statustext = L"Profiler graph shown"; - } else if (!*show_wireframe && client->checkPrivilege("debug")) { - *show_profiler_graph = false; - *show_wireframe = true; - statustext = L"Wireframe shown"; + if (!flags.show_debug) { + flags.show_debug = true; + flags.show_profiler_graph = false; + draw_control->show_wireframe = false; + m_statustext = L"Debug info shown"; + } else if (!flags.show_profiler_graph && !draw_control->show_wireframe) { + flags.show_profiler_graph = true; + m_statustext = L"Profiler graph shown"; + } else if (!draw_control->show_wireframe && client->checkPrivilege("debug")) { + flags.show_profiler_graph = false; + draw_control->show_wireframe = true; + m_statustext = L"Wireframe shown"; } else { - *show_debug = false; - *show_profiler_graph = false; - *show_wireframe = false; + flags.show_debug = false; + flags.show_profiler_graph = false; + draw_control->show_wireframe = false; if (client->checkPrivilege("debug")) { - statustext = L"Debug info, profiler graph, and wireframe hidden"; + m_statustext = L"Debug info, profiler graph, and wireframe hidden"; } else { - statustext = L"Debug info and profiler graph hidden"; + m_statustext = L"Debug info and profiler graph hidden"; } } - *statustext_time = 0; + runData.statustext_time = 0; } -void Game::toggleUpdateCamera(float *statustext_time, bool *flag) +void Game::toggleUpdateCamera() { static const wchar_t *msg[] = { L"Camera update enabled", L"Camera update disabled" }; - *flag = !*flag; - *statustext_time = 0; - statustext = msg[*flag]; + flags.disable_camera_update = !flags.disable_camera_update; + runData.statustext_time = 0; + m_statustext = msg[flags.disable_camera_update]; } -void Game::toggleProfiler(float *statustext_time, u32 *profiler_current_page, - u32 profiler_max_page) +void Game::toggleProfiler() { - *profiler_current_page = (*profiler_current_page + 1) % (profiler_max_page + 1); + runData.profiler_current_page = + (runData.profiler_current_page + 1) % (runData.profiler_max_page + 1); // FIXME: This updates the profiler with incomplete values - update_profiler_gui(guitext_profiler, g_fontengine, *profiler_current_page, - profiler_max_page, driver->getScreenSize().Height); + update_profiler_gui(guitext_profiler, g_fontengine, runData.profiler_current_page, + runData.profiler_max_page, driver->getScreenSize().Height); - if (*profiler_current_page != 0) { + if (runData.profiler_current_page != 0) { std::wstringstream sstr; - sstr << "Profiler shown (page " << *profiler_current_page - << " of " << profiler_max_page << ")"; - statustext = sstr.str(); + sstr << "Profiler shown (page " << runData.profiler_current_page + << " of " << runData.profiler_max_page << ")"; + m_statustext = sstr.str(); } else { - statustext = L"Profiler hidden"; + m_statustext = L"Profiler hidden"; } - *statustext_time = 0; + runData.statustext_time = 0; } -void Game::increaseViewRange(float *statustext_time) +void Game::increaseViewRange() { s16 range = g_settings->getS16("viewing_range"); s16 range_new = range + 10; if (range_new > 4000) { range_new = 4000; - statustext = utf8_to_wide("Viewing range is at maximum: " + m_statustext = utf8_to_wide("Viewing range is at maximum: " + itos(range_new)); } else { - statustext = utf8_to_wide("Viewing range changed to " + m_statustext = utf8_to_wide("Viewing range changed to " + itos(range_new)); } g_settings->set("viewing_range", itos(range_new)); - *statustext_time = 0; + runData.statustext_time = 0; } -void Game::decreaseViewRange(float *statustext_time) +void Game::decreaseViewRange() { s16 range = g_settings->getS16("viewing_range"); s16 range_new = range - 10; if (range_new < 20) { range_new = 20; - statustext = utf8_to_wide("Viewing range is at minimum: " + m_statustext = utf8_to_wide("Viewing range is at minimum: " + itos(range_new)); } else { - statustext = utf8_to_wide("Viewing range changed to " + m_statustext = utf8_to_wide("Viewing range changed to " + itos(range_new)); } g_settings->set("viewing_range", itos(range_new)); - *statustext_time = 0; + runData.statustext_time = 0; } -void Game::toggleFullViewRange(float *statustext_time) +void Game::toggleFullViewRange() { static const wchar_t *msg[] = { L"Disabled full viewing range", @@ -3025,13 +2906,12 @@ void Game::toggleFullViewRange(float *statustext_time) draw_control->range_all = !draw_control->range_all; infostream << msg[draw_control->range_all] << std::endl; - statustext = msg[draw_control->range_all]; - *statustext_time = 0; + m_statustext = msg[draw_control->range_all]; + runData.statustext_time = 0; } -void Game::updateCameraDirection(CameraOrientation *cam, - VolatileRunFlags *flags, float dtime) +void Game::updateCameraDirection(CameraOrientation *cam, float dtime) { if ((device->isWindowActive() && noMenuActive()) || random_input) { @@ -3043,10 +2923,10 @@ void Game::updateCameraDirection(CameraOrientation *cam, } #endif - if (flags->first_loop_after_window_activation) - flags->first_loop_after_window_activation = false; + if (m_first_loop_after_window_activation) + m_first_loop_after_window_activation = false; else - updateCameraOrientation(cam, *flags, dtime); + updateCameraOrientation(cam, dtime); input->setMousePos((driver->getScreenSize().Width / 2), (driver->getScreenSize().Height / 2)); @@ -3054,18 +2934,17 @@ void Game::updateCameraDirection(CameraOrientation *cam, #ifndef ANDROID // Mac OSX gets upset if this is set every frame - if (device->getCursorControl()->isVisible() == false) + if (!device->getCursorControl()->isVisible()) device->getCursorControl()->setVisible(true); #endif - if (!flags->first_loop_after_window_activation) - flags->first_loop_after_window_activation = true; + if (!m_first_loop_after_window_activation) + m_first_loop_after_window_activation = true; } } -void Game::updateCameraOrientation(CameraOrientation *cam, - const VolatileRunFlags &flags, float dtime) +void Game::updateCameraOrientation(CameraOrientation *cam, float dtime) { #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) { @@ -3077,8 +2956,7 @@ void Game::updateCameraOrientation(CameraOrientation *cam, s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2); s32 dy = input->getMousePos().Y - (driver->getScreenSize().Height / 2); - if (flags.invert_mouse - || camera->getCameraMode() == CAMERA_MODE_THIRD_FRONT) { + if (m_invert_mouse || camera->getCameraMode() == CAMERA_MODE_THIRD_FRONT) { dy = -dy; } @@ -3091,10 +2969,8 @@ void Game::updateCameraOrientation(CameraOrientation *cam, if (m_cache_enable_joysticks) { f32 c = m_cache_joystick_frustum_sensitivity * (1.f / 32767.f) * dtime; - cam->camera_yaw -= input->joystick.getAxisWithoutDead(JA_FRUSTUM_HORIZONTAL) * - c; - cam->camera_pitch += input->joystick.getAxisWithoutDead(JA_FRUSTUM_VERTICAL) * - c; + cam->camera_yaw -= input->joystick.getAxisWithoutDead(JA_FRUSTUM_HORIZONTAL) * c; + cam->camera_pitch += input->joystick.getAxisWithoutDead(JA_FRUSTUM_VERTICAL) * c; } cam->camera_pitch = rangelim(cam->camera_pitch, -89.5, 89.5); @@ -3177,7 +3053,7 @@ inline void Game::step(f32 *dtime) } -void Game::processClientEvents(CameraOrientation *cam, float *damage_flash) +void Game::processClientEvents(CameraOrientation *cam) { ClientEvent event = client->getClientEvent(); @@ -3185,31 +3061,40 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash) for ( ; event.type != CE_NONE; event = client->getClientEvent()) { - if (event.type == CE_PLAYER_DAMAGE && - client->getHP() != 0) { - client->getScript()->on_damage_taken(event.player_damage.amount); + switch (event.type) { + case CE_PLAYER_DAMAGE: + if (client->getHP() == 0) + break; + if (client->moddingEnabled()) { + client->getScript()->on_damage_taken(event.player_damage.amount); + } - *damage_flash += 95.0 + 3.2 * event.player_damage.amount; - *damage_flash = MYMIN(*damage_flash, 127.0); + runData.damage_flash += 95.0 + 3.2 * event.player_damage.amount; + runData.damage_flash = MYMIN(runData.damage_flash, 127.0); player->hurt_tilt_timer = 1.5; player->hurt_tilt_strength = rangelim(event.player_damage.amount / 4, 1.0, 4.0); - MtEvent *e = new SimpleTriggerEvent("PlayerDamage"); - client->event()->put(e); - } else if (event.type == CE_PLAYER_FORCE_MOVE) { + client->event()->put(new SimpleTriggerEvent("PlayerDamage")); + break; + + case CE_PLAYER_FORCE_MOVE: cam->camera_yaw = event.player_force_move.yaw; cam->camera_pitch = event.player_force_move.pitch; - } else if (event.type == CE_DEATHSCREEN) { + break; + + case CE_DEATHSCREEN: + // This should be enabled for death formspec in builtin client->getScript()->on_death(); /* Handle visualization */ - *damage_flash = 0; + runData.damage_flash = 0; player->hurt_tilt_timer = 0; player->hurt_tilt_strength = 0; + break; - } else if (event.type == CE_SHOW_FORMSPEC) { + case CE_SHOW_FORMSPEC: if (*(event.show_formspec.formspec) == "") { if (current_formspec && ( *(event.show_formspec.formname) == "" || *(event.show_formspec.formname) == cur_formname) ){ current_formspec->quitMenu(); @@ -3225,55 +3110,64 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash) cur_formname = *(event.show_formspec.formname); } - delete(event.show_formspec.formspec); - delete(event.show_formspec.formname); - } else if (event.type == CE_SHOW_LOCAL_FORMSPEC) { - FormspecFormSource *fs_src = new FormspecFormSource(*event.show_formspec.formspec); - LocalFormspecHandler *txt_dst = new LocalFormspecHandler(*event.show_formspec.formname, client); - create_formspec_menu(¤t_formspec, client, device, &input->joystick, - fs_src, txt_dst); delete event.show_formspec.formspec; delete event.show_formspec.formname; - } else if ((event.type == CE_SPAWN_PARTICLE) || - (event.type == CE_ADD_PARTICLESPAWNER) || - (event.type == CE_DELETE_PARTICLESPAWNER)) { + break; + + case CE_SHOW_LOCAL_FORMSPEC: + { + FormspecFormSource *fs_src = new FormspecFormSource(*event.show_formspec.formspec); + LocalFormspecHandler *txt_dst = new LocalFormspecHandler(*event.show_formspec.formname, client); + create_formspec_menu(¤t_formspec, client, device, &input->joystick, + fs_src, txt_dst); + } + delete event.show_formspec.formspec; + delete event.show_formspec.formname; + break; + + case CE_SPAWN_PARTICLE: + case CE_ADD_PARTICLESPAWNER: + case CE_DELETE_PARTICLESPAWNER: client->getParticleManager()->handleParticleEvent(&event, client, smgr, player); - } else if (event.type == CE_HUDADD) { - u32 id = event.hudadd.id; - - LocalPlayer *player = client->getEnv().getLocalPlayer(); - HudElement *e = player->getHud(id); - - if (e != NULL) { - delete event.hudadd.pos; - delete event.hudadd.name; - delete event.hudadd.scale; - delete event.hudadd.text; - delete event.hudadd.align; - delete event.hudadd.offset; - delete event.hudadd.world_pos; - delete event.hudadd.size; - continue; - } + break; + + case CE_HUDADD: + { + u32 id = event.hudadd.id; + + HudElement *e = player->getHud(id); + + if (e != NULL) { + delete event.hudadd.pos; + delete event.hudadd.name; + delete event.hudadd.scale; + delete event.hudadd.text; + delete event.hudadd.align; + delete event.hudadd.offset; + delete event.hudadd.world_pos; + delete event.hudadd.size; + continue; + } - e = new HudElement; - e->type = (HudElementType)event.hudadd.type; - e->pos = *event.hudadd.pos; - e->name = *event.hudadd.name; - e->scale = *event.hudadd.scale; - e->text = *event.hudadd.text; - e->number = event.hudadd.number; - e->item = event.hudadd.item; - e->dir = event.hudadd.dir; - e->align = *event.hudadd.align; - e->offset = *event.hudadd.offset; - e->world_pos = *event.hudadd.world_pos; - e->size = *event.hudadd.size; - - u32 new_id = player->addHud(e); - //if this isn't true our huds aren't consistent - sanity_check(new_id == id); + e = new HudElement; + e->type = (HudElementType)event.hudadd.type; + e->pos = *event.hudadd.pos; + e->name = *event.hudadd.name; + e->scale = *event.hudadd.scale; + e->text = *event.hudadd.text; + e->number = event.hudadd.number; + e->item = event.hudadd.item; + e->dir = event.hudadd.dir; + e->align = *event.hudadd.align; + e->offset = *event.hudadd.offset; + e->world_pos = *event.hudadd.world_pos; + e->size = *event.hudadd.size; + + u32 new_id = player->addHud(e); + //if this isn't true our huds aren't consistent + sanity_check(new_id == id); + } delete event.hudadd.pos; delete event.hudadd.name; @@ -3283,74 +3177,84 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash) delete event.hudadd.offset; delete event.hudadd.world_pos; delete event.hudadd.size; - } else if (event.type == CE_HUDRM) { - HudElement *e = player->removeHud(event.hudrm.id); - - if (e != NULL) - delete(e); - } else if (event.type == CE_HUDCHANGE) { - u32 id = event.hudchange.id; - HudElement *e = player->getHud(id); - - if (e == NULL) { - delete event.hudchange.v3fdata; - delete event.hudchange.v2fdata; - delete event.hudchange.sdata; - delete event.hudchange.v2s32data; - continue; + break; + + case CE_HUDRM: + { + HudElement *e = player->removeHud(event.hudrm.id); + + if (e != NULL) + delete e; } + break; - switch (event.hudchange.stat) { - case HUD_STAT_POS: - e->pos = *event.hudchange.v2fdata; - break; + case CE_HUDCHANGE: + { + u32 id = event.hudchange.id; + HudElement *e = player->getHud(id); - case HUD_STAT_NAME: - e->name = *event.hudchange.sdata; - break; + if (e == NULL) { + delete event.hudchange.v3fdata; + delete event.hudchange.v2fdata; + delete event.hudchange.sdata; + delete event.hudchange.v2s32data; + continue; + } - case HUD_STAT_SCALE: - e->scale = *event.hudchange.v2fdata; - break; + switch (event.hudchange.stat) { + case HUD_STAT_POS: + e->pos = *event.hudchange.v2fdata; + break; - case HUD_STAT_TEXT: - e->text = *event.hudchange.sdata; - break; + case HUD_STAT_NAME: + e->name = *event.hudchange.sdata; + break; - case HUD_STAT_NUMBER: - e->number = event.hudchange.data; - break; + case HUD_STAT_SCALE: + e->scale = *event.hudchange.v2fdata; + break; - case HUD_STAT_ITEM: - e->item = event.hudchange.data; - break; + case HUD_STAT_TEXT: + e->text = *event.hudchange.sdata; + break; - case HUD_STAT_DIR: - e->dir = event.hudchange.data; - break; + case HUD_STAT_NUMBER: + e->number = event.hudchange.data; + break; - case HUD_STAT_ALIGN: - e->align = *event.hudchange.v2fdata; - break; + case HUD_STAT_ITEM: + e->item = event.hudchange.data; + break; - case HUD_STAT_OFFSET: - e->offset = *event.hudchange.v2fdata; - break; + case HUD_STAT_DIR: + e->dir = event.hudchange.data; + break; - case HUD_STAT_WORLD_POS: - e->world_pos = *event.hudchange.v3fdata; - break; + case HUD_STAT_ALIGN: + e->align = *event.hudchange.v2fdata; + break; - case HUD_STAT_SIZE: - e->size = *event.hudchange.v2s32data; - break; + case HUD_STAT_OFFSET: + e->offset = *event.hudchange.v2fdata; + break; + + case HUD_STAT_WORLD_POS: + e->world_pos = *event.hudchange.v3fdata; + break; + + case HUD_STAT_SIZE: + e->size = *event.hudchange.v2s32data; + break; + } } delete event.hudchange.v3fdata; delete event.hudchange.v2fdata; delete event.hudchange.sdata; delete event.hudchange.v2s32data; - } else if (event.type == CE_SET_SKY) { + break; + + case CE_SET_SKY: sky->setVisible(false); if (skybox) { @@ -3384,17 +3288,24 @@ void Game::processClientEvents(CameraOrientation *cam, float *damage_flash) delete event.set_sky.bgcolor; delete event.set_sky.type; delete event.set_sky.params; - } else if (event.type == CE_OVERRIDE_DAY_NIGHT_RATIO) { - bool enable = event.override_day_night_ratio.do_override; - u32 value = event.override_day_night_ratio.ratio_f * 1000; - client->getEnv().setDayNightRatioOverride(enable, value); + break; + + case CE_OVERRIDE_DAY_NIGHT_RATIO: + client->getEnv().setDayNightRatioOverride( + event.override_day_night_ratio.do_override, + event.override_day_night_ratio.ratio_f * 1000); + break; + + default: + // unknown or unhandled type + break; + } } } -void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time, - f32 dtime, float time_from_last_punch) +void Game::updateCamera(u32 busy_time, f32 dtime) { LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -3411,6 +3322,7 @@ void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time, if (mlist && client->getPlayerItem() < mlist->getSize()) playeritem = mlist->getItem(client->getPlayerItem()); } + if (playeritem.getDefinition(itemdef_manager).name.empty()) { // override the hand InventoryList *hlist = local_inventory->getList("hand"); if (hlist) @@ -3437,7 +3349,7 @@ void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time, } float full_punch_interval = playeritem_toolcap.full_punch_interval; - float tool_reload_ratio = time_from_last_punch / full_punch_interval; + float tool_reload_ratio = runData.time_from_last_punch / full_punch_interval; tool_reload_ratio = MYMIN(tool_reload_ratio, 1.0); camera->update(player, dtime, busy_time / 1000.0f, tool_reload_ratio, @@ -3449,13 +3361,13 @@ void Game::updateCamera(VolatileRunFlags *flags, u32 busy_time, f32 camera_fov = camera->getFovMax(); v3s16 camera_offset = camera->getOffset(); - flags->camera_offset_changed = (camera_offset != old_camera_offset); + m_camera_offset_changed = (camera_offset != old_camera_offset); - if (!flags->disable_camera_update) { + if (!flags.disable_camera_update) { client->getEnv().getClientMap().updateCamera(camera_position, camera_direction, camera_fov, camera_offset); - if (flags->camera_offset_changed) { + if (m_camera_offset_changed) { client->updateCameraOffset(camera_offset); client->getEnv().updateCameraOffset(camera_offset); @@ -3488,8 +3400,7 @@ void Game::updateSound(f32 dtime) } -void Game::processPlayerInteraction(GameRunData *runData, - f32 dtime, bool show_hud, bool show_debug) +void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug) { LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -3501,13 +3412,11 @@ void Game::processPlayerInteraction(GameRunData *runData, playeritem = mlist->getItem(client->getPlayerItem()); } - if (playeritem.getDefinition(itemdef_manager).name.empty()) { // override the hand - InventoryList *hlist = local_inventory->getList("hand"); - if (hlist) - playeritem = hlist->getItem(0); - } const ItemDefinition &playeritem_def = playeritem.getDefinition(itemdef_manager); + InventoryList *hlist = local_inventory->getList("hand"); + const ItemDefinition &hand_def = + hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get(""); v3f player_position = player->getPosition(); v3f camera_position = camera->getPosition(); @@ -3520,7 +3429,7 @@ void Game::processPlayerInteraction(GameRunData *runData, */ f32 d = playeritem_def.range; // max. distance - f32 d_hand = itemdef_manager->get("").range; + f32 d_hand = hand_def.range; if (d < 0 && d_hand >= 0) d = d_hand; @@ -3549,12 +3458,10 @@ void Game::processPlayerInteraction(GameRunData *runData, PointedThing pointed = updatePointedThing(shootline, playeritem_def.liquids_pointable, - !runData->ldown_for_dig, - camera_offset, - // output - runData->selected_object); + !runData.ldown_for_dig, + camera_offset); - if (pointed != runData->pointed_old) { + if (pointed != runData.pointed_old) { infostream << "Pointing at " << pointed.dump() << std::endl; hud->updateSelectionMesh(camera_offset); } @@ -3564,45 +3471,49 @@ void Game::processPlayerInteraction(GameRunData *runData, - releasing left mouse button - pointing away from node */ - if (runData->digging) { + if (runData.digging) { if (getLeftReleased()) { infostream << "Left button released" << " (stopped digging)" << std::endl; - runData->digging = false; - } else if (pointed != runData->pointed_old) { + runData.digging = false; + } else if (pointed != runData.pointed_old) { if (pointed.type == POINTEDTHING_NODE - && runData->pointed_old.type == POINTEDTHING_NODE + && runData.pointed_old.type == POINTEDTHING_NODE && pointed.node_undersurface - == runData->pointed_old.node_undersurface) { + == runData.pointed_old.node_undersurface) { // Still pointing to the same node, but a different face. // Don't reset. } else { infostream << "Pointing away from node" << " (stopped digging)" << std::endl; - runData->digging = false; + runData.digging = false; hud->updateSelectionMesh(camera_offset); } } - if (!runData->digging) { - client->interact(1, runData->pointed_old); + if (!runData.digging) { + client->interact(1, runData.pointed_old); client->setCrack(-1, v3s16(0, 0, 0)); - runData->dig_time = 0.0; + runData.dig_time = 0.0; } + } else if (runData.dig_instantly && getLeftReleased()) { + // Remove e.g. torches faster when clicking instead of holding LMB + runData.nodig_delay_timer = 0; + runData.dig_instantly = false; } - if (!runData->digging && runData->ldown_for_dig && !isLeftPressed()) { - runData->ldown_for_dig = false; + if (!runData.digging && runData.ldown_for_dig && !isLeftPressed()) { + runData.ldown_for_dig = false; } - runData->left_punch = false; + runData.left_punch = false; soundmaker->m_player_leftpunch_sound.name = ""; if (isRightPressed()) - runData->repeat_rightclick_timer += dtime; + runData.repeat_rightclick_timer += dtime; else - runData->repeat_rightclick_timer = 0; + runData.repeat_rightclick_timer = 0; if (playeritem_def.usable && isLeftPressed()) { if (getLeftClicked()) @@ -3610,21 +3521,22 @@ void Game::processPlayerInteraction(GameRunData *runData, } else if (pointed.type == POINTEDTHING_NODE) { ToolCapabilities playeritem_toolcap = playeritem.getToolCapabilities(itemdef_manager); - handlePointingAtNode(runData, pointed, playeritem_def, - playeritem_toolcap, dtime); + if (playeritem.name.empty()) { + playeritem_toolcap = *hand_def.tool_capabilities; + } + handlePointingAtNode(pointed, playeritem_def, playeritem_toolcap, dtime); } else if (pointed.type == POINTEDTHING_OBJECT) { - handlePointingAtObject(runData, pointed, playeritem, - player_position, show_debug); + handlePointingAtObject(pointed, playeritem, player_position, show_debug); } else if (isLeftPressed()) { // When button is held down in air, show continuous animation - runData->left_punch = true; + runData.left_punch = true; } else if (getRightClicked()) { - handlePointingAtNothing(runData, playeritem); + handlePointingAtNothing(playeritem); } - runData->pointed_old = pointed; + runData.pointed_old = pointed; - if (runData->left_punch || getLeftClicked()) + if (runData.left_punch || getLeftClicked()) camera->setDigging(0); // left click animation input->resetLeftClicked(); @@ -3645,8 +3557,7 @@ PointedThing Game::updatePointedThing( const core::line3d &shootline, bool liquids_pointable, bool look_for_object, - const v3s16 &camera_offset, - ClientActiveObject *&selected_object) + const v3s16 &camera_offset) { std::vector *selectionboxes = hud->getSelectionBoxes(); selectionboxes->clear(); @@ -3657,21 +3568,21 @@ PointedThing Game::updatePointedThing( ClientMap &map = client->getEnv().getClientMap(); INodeDefManager *nodedef=client->getNodeDefManager(); - selected_object = NULL; + runData.selected_object = NULL; PointedThing result=client->getEnv().getPointedThing( shootline, liquids_pointable, look_for_object); if (result.type == POINTEDTHING_OBJECT) { - selected_object = client->getEnv().getActiveObject(result.object_id); - if (show_entity_selectionbox && selected_object->doShowSelectionBox()) { - aabb3f *selection_box = selected_object->getSelectionBox(); + runData.selected_object = client->getEnv().getActiveObject(result.object_id); + if (show_entity_selectionbox && runData.selected_object->doShowSelectionBox()) { + aabb3f *selection_box = runData.selected_object->getSelectionBox(); // Box should exist because object was // returned in the first place assert(selection_box); - v3f pos = selected_object->getPosition(); + v3f pos = runData.selected_object->getPosition(); selectionboxes->push_back(aabb3f( selection_box->MinEdge, selection_box->MaxEdge)); selectionboxes->push_back( @@ -3742,7 +3653,7 @@ PointedThing Game::updatePointedThing( } -void Game::handlePointingAtNothing(GameRunData *runData, const ItemStack &playerItem) +void Game::handlePointingAtNothing(const ItemStack &playerItem) { infostream << "Right Clicked in Air" << std::endl; PointedThing fauxPointed; @@ -3751,8 +3662,7 @@ void Game::handlePointingAtNothing(GameRunData *runData, const ItemStack &player } -void Game::handlePointingAtNode(GameRunData *runData, - const PointedThing &pointed, const ItemDefinition &playeritem_def, +void Game::handlePointingAtNode(const PointedThing &pointed, const ItemDefinition &playeritem_def, const ToolCapabilities &playeritem_toolcap, f32 dtime) { v3s16 nodepos = pointed.node_undersurface; @@ -3776,15 +3686,15 @@ void Game::handlePointingAtNode(GameRunData *runData, } } - if (runData->nodig_delay_timer <= 0.0 && isLeftPressed() + if (runData.nodig_delay_timer <= 0.0 && isLeftPressed() && client->checkPrivilege("interact")) { - handleDigging(runData, pointed, nodepos, playeritem_toolcap, dtime); + handleDigging(pointed, nodepos, playeritem_toolcap, dtime); } if ((getRightClicked() || - runData->repeat_rightclick_timer >= m_repeat_right_click_time) && + runData.repeat_rightclick_timer >= m_repeat_right_click_time) && client->checkPrivilege("interact")) { - runData->repeat_rightclick_timer = 0; + runData.repeat_rightclick_timer = 0; infostream << "Ground right-clicked" << std::endl; if (meta && meta->getString("formspec") != "" && !random_input @@ -3820,6 +3730,9 @@ void Game::handlePointingAtNode(GameRunData *runData, // Read the sound soundmaker->m_player_rightpunch_sound = playeritem_def.sound_place; + + if (client->moddingEnabled()) + client->getScript()->on_placenode(pointed, playeritem_def); } else { soundmaker->m_player_rightpunch_sound = SimpleSoundSpec(); @@ -3837,31 +3750,28 @@ void Game::handlePointingAtNode(GameRunData *runData, } -void Game::handlePointingAtObject(GameRunData *runData, - const PointedThing &pointed, - const ItemStack &playeritem, - const v3f &player_position, - bool show_debug) +void Game::handlePointingAtObject(const PointedThing &pointed, const ItemStack &playeritem, + const v3f &player_position, bool show_debug) { infotext = unescape_enriched( - utf8_to_wide(runData->selected_object->infoText())); + utf8_to_wide(runData.selected_object->infoText())); if (show_debug) { if (infotext != L"") { infotext += L"\n"; } infotext += unescape_enriched(utf8_to_wide( - runData->selected_object->debugInfoText())); + runData.selected_object->debugInfoText())); } if (isLeftPressed()) { bool do_punch = false; bool do_punch_damage = false; - if (runData->object_hit_delay_timer <= 0.0) { + if (runData.object_hit_delay_timer <= 0.0) { do_punch = true; do_punch_damage = true; - runData->object_hit_delay_timer = object_hit_delay; + runData.object_hit_delay_timer = object_hit_delay; } if (getLeftClicked()) @@ -3869,17 +3779,24 @@ void Game::handlePointingAtObject(GameRunData *runData, if (do_punch) { infostream << "Left-clicked object" << std::endl; - runData->left_punch = true; + runData.left_punch = true; } if (do_punch_damage) { // Report direct punch - v3f objpos = runData->selected_object->getPosition(); + v3f objpos = runData.selected_object->getPosition(); v3f dir = (objpos - player_position).normalize(); + ItemStack item = playeritem; + if (playeritem.name.empty()) { + InventoryList *hlist = local_inventory->getList("hand"); + if (hlist) { + item = hlist->getItem(0); + } + } - bool disable_send = runData->selected_object->directReportPunch( - dir, &playeritem, runData->time_from_last_punch); - runData->time_from_last_punch = 0; + bool disable_send = runData.selected_object->directReportPunch( + dir, &item, runData.time_from_last_punch); + runData.time_from_last_punch = 0; if (!disable_send) client->interact(0, pointed); @@ -3891,17 +3808,9 @@ void Game::handlePointingAtObject(GameRunData *runData, } -void Game::handleDigging(GameRunData *runData, - const PointedThing &pointed, const v3s16 &nodepos, +void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos, const ToolCapabilities &playeritem_toolcap, f32 dtime) { - if (!runData->digging) { - infostream << "Started digging" << std::endl; - client->interact(0, pointed); - runData->digging = true; - runData->ldown_for_dig = true; - } - LocalPlayer *player = client->getEnv().getLocalPlayer(); ClientMap &map = client->getEnv().getClientMap(); MapNode n = client->getEnv().getClientMap().getNodeNoEx(nodepos); @@ -3914,18 +3823,30 @@ void Game::handleDigging(GameRunData *runData, // If can't dig, try hand if (!params.diggable) { - const ItemDefinition &hand = itemdef_manager->get(""); + InventoryList *hlist = local_inventory->getList("hand"); + const ItemDefinition &hand = + hlist ? hlist->getItem(0).getDefinition(itemdef_manager) : itemdef_manager->get(""); const ToolCapabilities *tp = hand.tool_capabilities; if (tp) params = getDigParams(nodedef_manager->get(n).groups, tp); } - if (params.diggable == false) { + if (!runData.digging) { + infostream << "Started digging" << std::endl; + runData.dig_instantly = params.time == 0; + if (client->moddingEnabled() && client->getScript()->on_punchnode(nodepos, n)) + return; + client->interact(0, pointed); + runData.digging = true; + runData.ldown_for_dig = true; + } + + if (!params.diggable) { // I guess nobody will wait for this long - runData->dig_time_complete = 10000000.0; + runData.dig_time_complete = 10000000.0; } else { - runData->dig_time_complete = params.time; + runData.dig_time_complete = params.time; if (m_cache_enable_particles) { const ContentFeatures &features = @@ -3935,13 +3856,13 @@ void Game::handleDigging(GameRunData *runData, } } - if (runData->dig_time_complete >= 0.001) { - runData->dig_index = (float)crack_animation_length - * runData->dig_time - / runData->dig_time_complete; + if (!runData.dig_instantly) { + runData.dig_index = (float)crack_animation_length + * runData.dig_time + / runData.dig_time_complete; } else { - // This is for torches - runData->dig_index = crack_animation_length; + // This is for e.g. torches + runData.dig_index = crack_animation_length; } SimpleSoundSpec sound_dig = nodedef_manager->get(n).sound_dig; @@ -3960,54 +3881,58 @@ void Game::handleDigging(GameRunData *runData, } // Don't show cracks if not diggable - if (runData->dig_time_complete >= 100000.0) { - } else if (runData->dig_index < crack_animation_length) { + if (runData.dig_time_complete >= 100000.0) { + } else if (runData.dig_index < crack_animation_length) { //TimeTaker timer("client.setTempMod"); //infostream<<"dig_index="<setCrack(runData->dig_index, nodepos); + client->setCrack(runData.dig_index, nodepos); } else { infostream << "Digging completed" << std::endl; - client->interact(2, pointed); client->setCrack(-1, v3s16(0, 0, 0)); + + runData.dig_time = 0; + runData.digging = false; + + runData.nodig_delay_timer = + runData.dig_time_complete / (float)crack_animation_length; + + // We don't want a corresponding delay to very time consuming nodes + // and nodes without digging time (e.g. torches) get a fixed delay. + if (runData.nodig_delay_timer > 0.3) + runData.nodig_delay_timer = 0.3; + else if (runData.dig_instantly) + runData.nodig_delay_timer = 0.15; + bool is_valid_position; MapNode wasnode = map.getNodeNoEx(nodepos, &is_valid_position); - if (is_valid_position) + if (is_valid_position) { + if (client->moddingEnabled()) { + if (client->getScript()->on_dignode(nodepos, wasnode)) { + return; + } + } client->removeNode(nodepos); + } + + client->interact(2, pointed); if (m_cache_enable_particles) { const ContentFeatures &features = client->getNodeDefManager()->get(wasnode); client->getParticleManager()->addDiggingParticles(client, smgr, - player, nodepos, wasnode, features); + player, nodepos, wasnode, features); } - runData->dig_time = 0; - runData->digging = false; - - runData->nodig_delay_timer = - runData->dig_time_complete / (float)crack_animation_length; - - // We don't want a corresponding delay to - // very time consuming nodes - if (runData->nodig_delay_timer > 0.3) - runData->nodig_delay_timer = 0.3; - - // We want a slight delay to very little - // time consuming nodes - const float mindelay = 0.15; - - if (runData->nodig_delay_timer < mindelay) - runData->nodig_delay_timer = mindelay; // Send event to trigger sound MtEvent *e = new NodeDugEvent(nodepos, wasnode); client->event()->put(e); } - if (runData->dig_time_complete < 100000.0) { - runData->dig_time += dtime; + if (runData.dig_time_complete < 100000.0) { + runData.dig_time += dtime; } else { - runData->dig_time = 0; + runData.dig_time = 0; client->setCrack(-1, nodepos); } @@ -4015,8 +3940,7 @@ void Game::handleDigging(GameRunData *runData, } -void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, - GameRunData *runData, f32 dtime, const VolatileRunFlags &flags, +void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime, const CameraOrientation &cam) { LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -4026,9 +3950,9 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, */ if (draw_control->range_all) { - runData->fog_range = 100000 * BS; + runData.fog_range = 100000 * BS; } else { - runData->fog_range = draw_control->wanted_range * BS; + runData.fog_range = draw_control->wanted_range * BS; } /* @@ -4046,18 +3970,16 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, ScopeProfiler sp(g_profiler, "Detecting background light", SPT_AVG); float old_brightness = sky->getBrightness(); direct_brightness = client->getEnv().getClientMap() - .getBackgroundBrightness(MYMIN(runData->fog_range * 1.2, 60 * BS), + .getBackgroundBrightness(MYMIN(runData.fog_range * 1.2, 60 * BS), daynight_ratio, (int)(old_brightness * 255.5), &sunlight_seen) / 255.0; } - float time_of_day = runData->time_of_day; - float time_of_day_smooth = runData->time_of_day_smooth; + float time_of_day_smooth = runData.time_of_day_smooth; + float time_of_day = client->getEnv().getTimeOfDayF(); - time_of_day = client->getEnv().getTimeOfDayF(); - - const float maxsm = 0.05; - const float todsm = 0.05; + static const float maxsm = 0.05; + static const float todsm = 0.05; if (fabs(time_of_day - time_of_day_smooth) > maxsm && fabs(time_of_day - time_of_day_smooth + 1.0) > maxsm && @@ -4071,8 +3993,8 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, time_of_day_smooth = time_of_day_smooth * (1.0 - todsm) + time_of_day * todsm; - runData->time_of_day = time_of_day; - runData->time_of_day_smooth = time_of_day_smooth; + runData.time_of_day = time_of_day; + runData.time_of_day_smooth = time_of_day_smooth; sky->update(time_of_day_smooth, time_brightness, direct_brightness, sunlight_seen, camera->getCameraMode(), player->getYaw(), @@ -4106,8 +4028,8 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, driver->setFog( sky->getBgColor(), video::EFT_FOG_LINEAR, - runData->fog_range * m_cache_fog_start, - runData->fog_range * 1.0, + runData.fog_range * m_cache_fog_start, + runData.fog_range * 1.0, 0.01, false, // pixel fog true // range fog @@ -4131,24 +4053,24 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, v2u32 screensize = driver->getScreenSize(); updateChat(*client, dtime, flags.show_debug, screensize, - flags.show_chat, runData->profiler_current_page, + flags.show_chat, runData.profiler_current_page, *chat_backend, guitext_chat); /* Inventory */ - if (client->getPlayerItem() != runData->new_playeritem) - client->selectPlayerItem(runData->new_playeritem); + if (client->getPlayerItem() != runData.new_playeritem) + client->selectPlayerItem(runData.new_playeritem); // Update local inventory if it has changed if (client->getLocalInventoryUpdated()) { //infostream<<"Updating local inventory"<getLocalInventory(*local_inventory); - runData->update_wielded_item_trigger = true; + runData.update_wielded_item_trigger = true; } - if (runData->update_wielded_item_trigger) { + if (runData.update_wielded_item_trigger) { // Update wielded tool InventoryList *mlist = local_inventory->getList("main"); @@ -4162,25 +4084,25 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, camera->wield(item); } - runData->update_wielded_item_trigger = false; + runData.update_wielded_item_trigger = false; } /* Update block draw list every 200ms or when camera direction has changed much */ - runData->update_draw_list_timer += dtime; + runData.update_draw_list_timer += dtime; v3f camera_direction = camera->getDirection(); - if (runData->update_draw_list_timer >= 0.2 - || runData->update_draw_list_last_cam_dir.getDistanceFrom(camera_direction) > 0.2 - || flags.camera_offset_changed) { - runData->update_draw_list_timer = 0; + if (runData.update_draw_list_timer >= 0.2 + || runData.update_draw_list_last_cam_dir.getDistanceFrom(camera_direction) > 0.2 + || m_camera_offset_changed) { + runData.update_draw_list_timer = 0; client->getEnv().getClientMap().updateDrawList(driver); - runData->update_draw_list_last_cam_dir = camera_direction; + runData.update_draw_list_last_cam_dir = camera_direction; } - updateGui(&runData->statustext_time, *stats, *runData, dtime, flags, cam); + updateGui(*stats, dtime, cam); /* make sure menu is on top @@ -4200,14 +4122,10 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, Drawing begins */ - video::SColor skycolor = sky->getSkyColor(); + const video::SColor &skycolor = sky->getSkyColor(); TimeTaker tt_draw("mainloop: draw"); - { - TimeTaker timer("beginScene"); - driver->beginScene(true, true, skycolor); - stats->beginscenetime = timer.stop(true); - } + driver->beginScene(true, true, skycolor); draw_scene(driver, smgr, *camera, *client, player, *hud, *mapper, guienv, screensize, skycolor, flags.show_hud, @@ -4222,13 +4140,13 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, /* Damage flash */ - if (runData->damage_flash > 0.0) { - video::SColor color(runData->damage_flash, 180, 0, 0); + if (runData.damage_flash > 0.0) { + video::SColor color(runData.damage_flash, 180, 0, 0); driver->draw2DRectangle(color, core::rect(0, 0, screensize.X, screensize.Y), NULL); - runData->damage_flash -= 100.0 * dtime; + runData.damage_flash -= 100.0 * dtime; } /* @@ -4252,11 +4170,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, /* End scene */ - { - TimeTaker timer("endScene"); - driver->endScene(); - stats->endscenetime = timer.stop(true); - } + driver->endScene(); stats->drawtime = tt_draw.stop(true); g_profiler->graphAdd("mainloop_draw", stats->drawtime / 1000.0f); @@ -4274,9 +4188,7 @@ inline static const char *yawToDirectionString(int yaw) } -void Game::updateGui(float *statustext_time, const RunStats &stats, - const GameRunData& runData, f32 dtime, const VolatileRunFlags &flags, - const CameraOrientation &cam) +void Game::updateGui(const RunStats &stats, f32 dtime, const CameraOrientation &cam) { v2u32 screensize = driver->getScreenSize(); LocalPlayer *player = client->getEnv().getLocalPlayer(); @@ -4287,7 +4199,6 @@ void Game::updateGui(float *statustext_time, const RunStats &stats, drawtime_avg = drawtime_avg * 0.95 + stats.drawtime * 0.05; u16 fps = 1.0 / stats.dtime_jitter.avg; - //s32 fps = driver->getFPS(); std::ostringstream os(std::ios_base::binary); os << std::fixed @@ -4357,19 +4268,19 @@ void Game::updateGui(float *statustext_time, const RunStats &stats, float statustext_time_max = 1.5; - if (!statustext.empty()) { - *statustext_time += dtime; + if (!m_statustext.empty()) { + runData.statustext_time += dtime; - if (*statustext_time >= statustext_time_max) { - statustext = L""; - *statustext_time = 0; + if (runData.statustext_time >= statustext_time_max) { + m_statustext = L""; + runData.statustext_time = 0; } } - setStaticText(guitext_status, statustext.c_str()); - guitext_status->setVisible(!statustext.empty()); + setStaticText(guitext_status, m_statustext.c_str()); + guitext_status->setVisible(!m_statustext.empty()); - if (!statustext.empty()) { + if (!m_statustext.empty()) { s32 status_width = guitext_status->getTextWidth(); s32 status_height = guitext_status->getTextHeight(); s32 status_y = screensize.Y - 150; @@ -4390,7 +4301,7 @@ void Game::updateGui(float *statustext_time, const RunStats &stats, final_color.setAlpha(0); video::SColor fade_color = initial_color.getInterpolated_quadratic( initial_color, final_color, - pow(*statustext_time / statustext_time_max, 2.0f)); + pow(runData.statustext_time / statustext_time_max, 2.0f)); guitext_status->setOverrideColor(fade_color); guitext_status->enableOverrideColor(true); } @@ -4459,7 +4370,8 @@ inline void Game::limitFps(FpsControl *fps_timings, f32 *dtime) void Game::showOverlayMessage(const wchar_t *msg, float dtime, int percent, bool draw_clouds) { - draw_load_screen(msg, device, guienv, dtime, percent, draw_clouds); + draw_load_screen(msg, device, guienv, texture_src, dtime, percent, + draw_clouds); delete[] msg; } @@ -4523,6 +4435,75 @@ void Game::extendedResourceCleanup() << " (note: irrlicht doesn't support removing renderers)" << std::endl; } +void Game::showPauseMenu() +{ +#ifdef __ANDROID__ + static const std::string control_text = strgettext("Default Controls:\n" + "No menu visible:\n" + "- single tap: button activate\n" + "- double tap: place/use\n" + "- slide finger: look around\n" + "Menu/Inventory visible:\n" + "- double tap (outside):\n" + " -->close\n" + "- touch stack, touch slot:\n" + " --> move stack\n" + "- touch&drag, tap 2nd finger\n" + " --> place single item to slot\n" + ); +#else + static const std::string control_text = strgettext("Default Controls:\n" + "- WASD: move\n" + "- Space: jump/climb\n" + "- Shift: sneak/go down\n" + "- Q: drop item\n" + "- I: inventory\n" + "- Mouse: turn/look\n" + "- Mouse left: dig/punch\n" + "- Mouse right: place/use\n" + "- Mouse wheel: select item\n" + "- T: chat\n" + ); +#endif + + float ypos = simple_singleplayer_mode ? 0.5 : 0.1; + std::ostringstream os; + + os << FORMSPEC_VERSION_STRING << SIZE_TAG + << "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;" + << strgettext("Continue") << "]"; + + if (!simple_singleplayer_mode) { + os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;" + << strgettext("Change Password") << "]"; + } + +#ifndef __ANDROID__ + os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;" + << strgettext("Sound Volume") << "]"; + os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;" + << strgettext("Change Keys") << "]"; +#endif + os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;" + << strgettext("Exit to Menu") << "]"; + os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;" + << strgettext("Exit to OS") << "]" + << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]" + << "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;]"; + + /* Create menu */ + /* Note: FormspecFormSource and LocalFormspecHandler * + * are deleted by guiFormSpecMenu */ + FormspecFormSource *fs_src = new FormspecFormSource(os.str()); + LocalFormspecHandler *txt_dst = new LocalFormspecHandler("MT_PAUSE_MENU"); + + create_formspec_menu(¤t_formspec, client, device, &input->joystick, fs_src, txt_dst); + current_formspec->setFocus("btn_continue"); + current_formspec->doPause = true; +} /****************************************************************************/ /****************************************************************************