Skip to content

Commit 359c8f8

Browse files
committed
map.cpp: Initialize NodeNeighbor, set NeighborType to u8 & cleanup
Cleanup: * Drop unused Map::transforming_liquid_size() * NodeNeighbor must use const ref for v3s16 * Add a missing default in a switch case
1 parent 3face01 commit 359c8f8

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/map.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -512,22 +512,22 @@ void Map::PrintInfo(std::ostream &out)
512512

513513
#define WATER_DROP_BOOST 4
514514

515-
enum NeighborType {
515+
enum NeighborType : u8 {
516516
NEIGHBOR_UPPER,
517517
NEIGHBOR_SAME_LEVEL,
518518
NEIGHBOR_LOWER
519519
};
520+
520521
struct NodeNeighbor {
521522
MapNode n;
522523
NeighborType t;
523524
v3s16 p;
524-
bool l; //can liquid
525525

526526
NodeNeighbor()
527-
: n(CONTENT_AIR)
527+
: n(CONTENT_AIR), t(NEIGHBOR_SAME_LEVEL)
528528
{ }
529529

530-
NodeNeighbor(const MapNode &node, NeighborType n_type, v3s16 pos)
530+
NodeNeighbor(const MapNode &node, NeighborType n_type, const v3s16 &pos)
531531
: n(node),
532532
t(n_type),
533533
p(pos)
@@ -538,10 +538,6 @@ void Map::transforming_liquid_add(v3s16 p) {
538538
m_transforming_liquid.push_back(p);
539539
}
540540

541-
s32 Map::transforming_liquid_size() {
542-
return m_transforming_liquid.size();
543-
}
544-
545541
void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
546542
ServerEnvironment *env)
547543
{
@@ -645,6 +641,8 @@ void Map::transformLiquids(std::map<v3s16, MapBlock*> &modified_blocks,
645641
case 4:
646642
nt = NEIGHBOR_LOWER;
647643
break;
644+
default:
645+
break;
648646
}
649647
v3s16 npos = p0 + dirs[i];
650648
NodeNeighbor nb(getNodeNoEx(npos), nt, npos);

src/map.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ class Map /*: public NodeContainer*/
289289
*/
290290

291291
void transforming_liquid_add(v3s16 p);
292-
s32 transforming_liquid_size();
293292

294293
bool isBlockOccluded(MapBlock *block, v3s16 cam_pos_nodes);
295294
protected:

0 commit comments

Comments
 (0)