aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2014-11-20 17:25:01 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-05 16:14:50 +1000
commit0e78aa296ee8b552273fdc9d6fabec0fb01d2e4a (patch)
tree494f4e2c3a5b3890288fd7df36240b14d1ce61b6 /src
parent5da6896d51ae3ee5140dc1041eff44a616751231 (diff)
downloadminetest-0e78aa296ee8b552273fdc9d6fabec0fb01d2e4a.tar.gz
minetest-0e78aa296ee8b552273fdc9d6fabec0fb01d2e4a.tar.bz2
minetest-0e78aa296ee8b552273fdc9d6fabec0fb01d2e4a.zip
Add name of node 'pointed at' to debug
This is "Add name of node pointed at to debug #1677" by @rubenwardy updated to work with game.cpp after it was refactored.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/game.cpp b/src/game.cpp
index aa12e6c3f..706450da5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1502,8 +1502,9 @@ protected:
void updateFrame(std::vector<aabb3f> &highlight_boxes, ProfilerGraph *graph,
RunStats *stats, GameRunData *runData,
f32 dtime, const VolatileRunFlags &flags, const CameraOrientation &cam);
- void updateGui(float *statustext_time, const RunStats &stats, f32 dtime,
- const VolatileRunFlags &flags, const CameraOrientation &cam);
+ void updateGui(float *statustext_time, const RunStats &stats,
+ const GameRunData& runData, f32 dtime, const VolatileRunFlags &flags,
+ const CameraOrientation &cam);
void updateProfilerGraphs(ProfilerGraph *graph);
// Misc
@@ -3836,7 +3837,7 @@ void Game::updateFrame(std::vector<aabb3f> &highlight_boxes,
runData->update_draw_list_last_cam_dir = camera_direction;
}
- updateGui(&runData->statustext_time, *stats, dtime, flags, cam);
+ updateGui(&runData->statustext_time, *stats, *runData, dtime, flags, cam);
/*
make sure menu is on top
@@ -3913,8 +3914,9 @@ void Game::updateFrame(std::vector<aabb3f> &highlight_boxes,
}
-void Game::updateGui(float *statustext_time, const RunStats& stats,
- f32 dtime, const VolatileRunFlags &flags, const CameraOrientation &cam)
+void Game::updateGui(float *statustext_time, const RunStats &stats,
+ const GameRunData& runData, f32 dtime, const VolatileRunFlags &flags,
+ const CameraOrientation &cam)
{
v2u32 screensize = driver->getScreenSize();
LocalPlayer *player = client->getEnv().getLocalPlayer();
@@ -3969,6 +3971,19 @@ void Game::updateGui(float *statustext_time, const RunStats& stats,
<< ") (yaw=" << (wrapDegrees_0_360(cam.camera_yaw))
<< ") (seed = " << ((u64)client->getMapSeed())
<< ")";
+
+ if (runData.pointed_old.type == POINTEDTHING_NODE) {
+ ClientMap &map = client->getEnv().getClientMap();
+ const INodeDefManager *nodedef = client->getNodeDefManager();
+ MapNode n = map.getNodeNoEx(runData.pointed_old.node_undersurface);
+ if (n.getContent() != CONTENT_IGNORE && nodedef->get(n).name != "unknown") {
+ const ContentFeatures &features = nodedef->get(n);
+ os << " (pointing_at = " << nodedef->get(n).name
+ << " - " << features.tiledef[0].name.c_str()
+ << ")";
+ }
+ }
+
guitext2->setText(narrow_to_wide(os.str()).c_str());
guitext2->setVisible(true);