Skip to content

Commit 86d7f84

Browse files
osjcsfan5
osjc
authored and
sfan5
committed
Merge pull request #8776 from osjc/FixGetNode
Finish getNode cleanup
1 parent 291e773 commit 86d7f84

26 files changed

+120
-139
lines changed

‎src/client/camera.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime, f32 tool_r
412412
// Prevent camera positioned inside nodes
413413
const NodeDefManager *nodemgr = m_client->ndef();
414414
MapNode n = m_client->getEnv().getClientMap()
415-
.getNodeNoEx(floatToInt(my_cp, BS));
415+
.getNode(floatToInt(my_cp, BS));
416416

417417
const ContentFeatures& features = nodemgr->get(n);
418418
if (features.walkable) {

‎src/client/client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ MapNode Client::getNode(v3s16 p, bool *is_valid_position)
13011301
return {};
13021302
}
13031303
}
1304-
return m_env.getMap().getNodeNoEx(p, is_valid_position);
1304+
return m_env.getMap().getNode(p, is_valid_position);
13051305
}
13061306

13071307
void Client::addNode(v3s16 p, MapNode n, bool remove_metadata)

‎src/client/clientenvironment.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void ClientEnvironment::step(float dtime)
218218
f32 post_factor = 1; // 1 hp per node/s
219219
if (info.type == COLLISION_NODE) {
220220
const ContentFeatures &f = m_client->ndef()->
221-
get(m_map->getNodeNoEx(info.node_p));
221+
get(m_map->getNode(info.node_p));
222222
// Determine fall damage multiplier
223223
int addp = itemgroup_get(f.groups, "fall_damage_add_percent");
224224
pre_factor = 1.0f + (float)addp / 100.0f;
@@ -248,7 +248,7 @@ void ClientEnvironment::step(float dtime)
248248
MapNode node_at_lplayer(CONTENT_AIR, 0x0f, 0);
249249

250250
v3s16 p = lplayer->getLightPosition();
251-
node_at_lplayer = m_map->getNodeNoEx(p);
251+
node_at_lplayer = m_map->getNode(p);
252252

253253
u16 light = getInteriorLight(node_at_lplayer, 0, m_client->ndef());
254254
final_color_blend(&lplayer->light_color, light, day_night_ratio);
@@ -270,7 +270,7 @@ void ClientEnvironment::step(float dtime)
270270

271271
// Get node at head
272272
v3s16 p = cao->getLightPosition();
273-
MapNode n = this->m_map->getNodeNoEx(p, &pos_ok);
273+
MapNode n = this->m_map->getNode(p, &pos_ok);
274274
if (pos_ok)
275275
light = n.getLightBlend(day_night_ratio, m_client->ndef());
276276
else
@@ -351,7 +351,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
351351

352352
// Get node at head
353353
v3s16 p = object->getLightPosition();
354-
MapNode n = m_map->getNodeNoEx(p, &pos_ok);
354+
MapNode n = m_map->getNode(p, &pos_ok);
355355
if (pos_ok)
356356
light = n.getLightBlend(getDayNightRatio(), m_client->ndef());
357357
else

‎src/client/clientmap.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void ClientMap::updateDrawList()
160160
// inside ground
161161
bool occlusion_culling_enabled = true;
162162
if (g_settings->getBool("free_move")) {
163-
MapNode n = getNodeNoEx(cam_pos_nodes);
163+
MapNode n = getNode(cam_pos_nodes);
164164
if (n.getContent() == CONTENT_IGNORE ||
165165
m_nodedef->get(n).solidness == 2)
166166
occlusion_culling_enabled = false;
@@ -497,15 +497,15 @@ static bool getVisibleBrightness(Map *map, const v3f &p0, v3f dir, float step,
497497
// Check content nearly at camera position
498498
{
499499
v3s16 p = floatToInt(p0 /*+ dir * 3*BS*/, BS);
500-
MapNode n = map->getNodeNoEx(p);
500+
MapNode n = map->getNode(p);
501501
if(ndef->get(n).param_type == CPT_LIGHT &&
502502
!ndef->get(n).sunlight_propagates)
503503
allow_allowing_non_sunlight_propagates = true;
504504
}
505505
// If would start at CONTENT_IGNORE, start closer
506506
{
507507
v3s16 p = floatToInt(pf, BS);
508-
MapNode n = map->getNodeNoEx(p);
508+
MapNode n = map->getNode(p);
509509
if(n.getContent() == CONTENT_IGNORE){
510510
float newd = 2*BS;
511511
pf = p0 + dir * 2*newd;
@@ -519,7 +519,7 @@ static bool getVisibleBrightness(Map *map, const v3f &p0, v3f dir, float step,
519519
step *= step_multiplier;
520520

521521
v3s16 p = floatToInt(pf, BS);
522-
MapNode n = map->getNodeNoEx(p);
522+
MapNode n = map->getNode(p);
523523
if (allow_allowing_non_sunlight_propagates && i == 0 &&
524524
ndef->get(n).param_type == CPT_LIGHT &&
525525
!ndef->get(n).sunlight_propagates) {
@@ -621,7 +621,7 @@ int ClientMap::getBackgroundBrightness(float max_d, u32 daylight_factor,
621621

622622
int ret = 0;
623623
if(brightness_count == 0){
624-
MapNode n = getNodeNoEx(floatToInt(m_camera_position, BS));
624+
MapNode n = getNode(floatToInt(m_camera_position, BS));
625625
if(m_nodedef->get(n).param_type == CPT_LIGHT){
626626
ret = decode_light(n.getLightBlend(daylight_factor, m_nodedef));
627627
} else {
@@ -640,7 +640,7 @@ void ClientMap::renderPostFx(CameraMode cam_mode)
640640
// Sadly ISceneManager has no "post effects" render pass, in that case we
641641
// could just register for that and handle it in renderMap().
642642

643-
MapNode n = getNodeNoEx(floatToInt(m_camera_position, BS));
643+
MapNode n = getNode(floatToInt(m_camera_position, BS));
644644

645645
// - If the player is in a solid node, make everything black.
646646
// - If the player is in liquid, draw a semi-transparent overlay.

‎src/client/content_cao.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
991991
const NodeDefManager *ndef = m_client->ndef();
992992
v3s16 p = floatToInt(getPosition() +
993993
v3f(0.0f, (m_prop.collisionbox.MinEdge.Y - 0.5f) * BS, 0.0f), BS);
994-
MapNode n = m_env->getMap().getNodeNoEx(p);
994+
MapNode n = m_env->getMap().getNode(p);
995995
SimpleSoundSpec spec = ndef->get(n).sound_footstep;
996996
// Reduce footstep gain, as non-local-player footsteps are
997997
// somehow louder.

‎src/client/content_cso.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class SmokePuffCSO: public ClientSimpleObject
4848
/* Update brightness */
4949
u8 light;
5050
bool pos_ok;
51-
MapNode n = env->getMap().getNodeNoEx(floatToInt(pos, BS), &pos_ok);
51+
MapNode n = env->getMap().getNode(floatToInt(pos, BS), &pos_ok);
5252
light = pos_ok ? decode_light(n.getLightBlend(env->getDayNightRatio(),
5353
env->getGameDef()->ndef()))
5454
: 64;

‎src/client/game.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,7 +2926,7 @@ void Game::updateSound(f32 dtime)
29262926
soundmaker->step(dtime);
29272927

29282928
ClientMap &map = client->getEnv().getClientMap();
2929-
MapNode n = map.getNodeNoEx(player->getFootstepNodePos());
2929+
MapNode n = map.getNode(player->getFootstepNodePos());
29302930
soundmaker->m_player_step_sound = nodedef_manager->get(n).sound_footstep;
29312931
}
29322932

@@ -3105,7 +3105,7 @@ PointedThing Game::updatePointedThing(
31053105
}
31063106
} else if (result.type == POINTEDTHING_NODE) {
31073107
// Update selection boxes
3108-
MapNode n = map.getNodeNoEx(result.node_undersurface);
3108+
MapNode n = map.getNode(result.node_undersurface);
31093109
std::vector<aabb3f> boxes;
31103110
n.getSelectionBoxes(nodedef, &boxes,
31113111
n.getNeighbors(result.node_undersurface, &map));
@@ -3132,12 +3132,12 @@ PointedThing Game::updatePointedThing(
31323132
v3s16 p = floatToInt(pf, BS);
31333133

31343134
// Get selection mesh light level
3135-
MapNode n = map.getNodeNoEx(p);
3135+
MapNode n = map.getNode(p);
31363136
u16 node_light = getInteriorLight(n, -1, nodedef);
31373137
u16 light_level = node_light;
31383138

31393139
for (const v3s16 &dir : g_6dirs) {
3140-
n = map.getNodeNoEx(p + dir);
3140+
n = map.getNode(p + dir);
31413141
node_light = getInteriorLight(n, -1, nodedef);
31423142
if (node_light > light_level)
31433143
light_level = node_light;
@@ -3198,7 +3198,7 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
31983198
m_game_ui->setInfoText(unescape_translate(utf8_to_wide(
31993199
meta->getString("infotext"))));
32003200
} else {
3201-
MapNode n = map.getNodeNoEx(nodepos);
3201+
MapNode n = map.getNode(nodepos);
32023202

32033203
if (nodedef_manager->get(n).tiledef[0].name == "unknown_node.png") {
32043204
m_game_ui->setInfoText(L"Unknown node: " +
@@ -3215,7 +3215,7 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
32153215
if (meta && !meta->getString("formspec").empty() && !random_input
32163216
&& !isKeyDown(KeyType::SNEAK)) {
32173217
// Report right click to server
3218-
if (nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable) {
3218+
if (nodedef_manager->get(map.getNode(nodepos)).rightclickable) {
32193219
client->interact(INTERACT_PLACE, pointed);
32203220
}
32213221

@@ -3258,7 +3258,7 @@ void Game::handlePointingAtNode(const PointedThing &pointed,
32583258
SimpleSoundSpec();
32593259

32603260
if (def.node_placement_prediction.empty() ||
3261-
nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable) {
3261+
nodedef_manager->get(map.getNode(nodepos)).rightclickable) {
32623262
client->interact(INTERACT_PLACE, pointed); // Report to server
32633263
} else {
32643264
soundmaker->m_player_rightpunch_sound =
@@ -3278,7 +3278,7 @@ bool Game::nodePlacementPrediction(const ItemDefinition &selected_def,
32783278
MapNode node;
32793279
bool is_valid_position;
32803280

3281-
node = map.getNodeNoEx(nodepos, &is_valid_position);
3281+
node = map.getNode(nodepos, &is_valid_position);
32823282
if (!is_valid_position)
32833283
return false;
32843284

@@ -3290,13 +3290,13 @@ bool Game::nodePlacementPrediction(const ItemDefinition &selected_def,
32903290
v3s16 p = neighbourpos;
32913291

32923292
// Place inside node itself if buildable_to
3293-
MapNode n_under = map.getNodeNoEx(nodepos, &is_valid_position);
3293+
MapNode n_under = map.getNode(nodepos, &is_valid_position);
32943294
if (is_valid_position)
32953295
{
32963296
if (nodedef->get(n_under).buildable_to)
32973297
p = nodepos;
32983298
else {
3299-
node = map.getNodeNoEx(p, &is_valid_position);
3299+
node = map.getNode(p, &is_valid_position);
33003300
if (is_valid_position &&!nodedef->get(node).buildable_to)
33013301
return false;
33023302
}
@@ -3363,7 +3363,7 @@ bool Game::nodePlacementPrediction(const ItemDefinition &selected_def,
33633363
else
33643364
pp = p + v3s16(0, -1, 0);
33653365

3366-
if (!nodedef->get(map.getNodeNoEx(pp)).walkable)
3366+
if (!nodedef->get(map.getNode(pp)).walkable)
33673367
return false;
33683368
}
33693369

@@ -3477,7 +3477,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
34773477
// See also: serverpackethandle.cpp, action == 2
34783478
LocalPlayer *player = client->getEnv().getLocalPlayer();
34793479
ClientMap &map = client->getEnv().getClientMap();
3480-
MapNode n = client->getEnv().getClientMap().getNodeNoEx(nodepos);
3480+
MapNode n = client->getEnv().getClientMap().getNode(nodepos);
34813481

34823482
// NOTE: Similar piece of code exists on the server side for
34833483
// cheat detection.
@@ -3565,7 +3565,7 @@ void Game::handleDigging(const PointedThing &pointed, const v3s16 &nodepos,
35653565
runData.nodig_delay_timer = 0.15;
35663566

35673567
bool is_valid_position;
3568-
MapNode wasnode = map.getNodeNoEx(nodepos, &is_valid_position);
3568+
MapNode wasnode = map.getNode(nodepos, &is_valid_position);
35693569
if (is_valid_position) {
35703570
if (client->moddingEnabled() &&
35713571
client->getScript()->on_dignode(nodepos, wasnode)) {

‎src/client/gameui.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void GameUI::update(const RunStats &stats, Client *client, MapDrawControl *draw_
136136
if (pointed_old.type == POINTEDTHING_NODE) {
137137
ClientMap &map = client->getEnv().getClientMap();
138138
const NodeDefManager *nodedef = client->getNodeDefManager();
139-
MapNode n = map.getNodeNoEx(pointed_old.node_undersurface);
139+
MapNode n = map.getNode(pointed_old.node_undersurface);
140140

141141
if (n.getContent() != CONTENT_IGNORE && nodedef->get(n).name != "unknown") {
142142
os << ", pointed: " << nodedef->get(n).name

0 commit comments

Comments
 (0)