diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2010-12-12 14:33:13 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2010-12-12 14:33:13 +0200 |
| commit | 47a593b5197393d8f8cdfe18b1aa46b8bc1f3fb6 (patch) | |
| tree | 82a521d57373bd5017e3c036016d39763ef26e66 /src/voxel.h | |
| parent | db49f37692d6a23db3e521736e5adcf285022827 (diff) | |
| download | minetest-47a593b5197393d8f8cdfe18b1aa46b8bc1f3fb6.tar.gz minetest-47a593b5197393d8f8cdfe18b1aa46b8bc1f3fb6.tar.bz2 minetest-47a593b5197393d8f8cdfe18b1aa46b8bc1f3fb6.zip | |
starting to separate "material" to "content" and "tile"
Diffstat (limited to 'src/voxel.h')
| -rw-r--r-- | src/voxel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/voxel.h b/src/voxel.h index 74c0a00e5..411cf4376 100644 --- a/src/voxel.h +++ b/src/voxel.h @@ -428,8 +428,8 @@ public: bool flowWater(v3s16 removed_pos, core::map<v3s16, u8> &active_nodes, int recursion_depth=0, - bool debugprint=false, int *counter=NULL, - int counterlimit=-1 + bool debugprint=false, + u32 stoptime=0 ); /* @@ -446,7 +446,7 @@ public: void flowWater(core::map<v3s16, u8> &active_nodes, int recursion_depth=0, bool debugprint=false, - int counterlimit=-1 + u32 timelimit=50 ); /* @@ -460,7 +460,7 @@ public: If not found from source, add with VOXELFLAG_INEXISTENT */ - virtual void emerge(VoxelArea a) + virtual void emerge(VoxelArea a, s32 caller_id=-1) { //dstream<<"emerge p=("<<p.X<<","<<p.Y<<","<<p.Z<<")"<<std::endl; addArea(a); |