diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-14 12:23:15 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-17 06:52:16 +0200 |
| commit | 143401451c457da5079b2970fe260acea45bd85a (patch) | |
| tree | 390c729ba28f974bf422d441dfd8dd7e817e4127 /src/map.cpp | |
| parent | decbd396df0855f0a356c836cf7c0c5b133964cf (diff) | |
| download | minetest-143401451c457da5079b2970fe260acea45bd85a.tar.gz minetest-143401451c457da5079b2970fe260acea45bd85a.tar.bz2 minetest-143401451c457da5079b2970fe260acea45bd85a.zip | |
DB::loadBlock copy removal & DB backend cleanup
* Remove the copy from db::loadBlock by using a pointer to the destination
* cleanup db backend, the child backend doesn't have to set their functions as virtual
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp index 66fabaf87..848d2ef13 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3442,8 +3442,7 @@ MapBlock* ServerMap::loadBlock(v3s16 blockpos) v2s16 p2d(blockpos.X, blockpos.Z); std::string ret; - - ret = dbase->loadBlock(blockpos); + dbase->loadBlock(blockpos, &ret); if (ret != "") { loadBlock(&ret, blockpos, createSector(p2d), false); return getBlockNoCreateNoEx(blockpos); |