diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-03-22 21:41:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 21:41:02 +0100 |
| commit | 072bbba69aa2528c309b76aaec288bdba52e119c (patch) | |
| tree | 60070fc33757aebdd52c666cdbd3de85fc2e673a /src/rollback_interface.cpp | |
| parent | 9efc5da0fb7d276deff55db6e4eb89d24ca72b5d (diff) | |
| download | minetest-072bbba69aa2528c309b76aaec288bdba52e119c.tar.gz minetest-072bbba69aa2528c309b76aaec288bdba52e119c.tar.bz2 minetest-072bbba69aa2528c309b76aaec288bdba52e119c.zip | |
Some performance optimizations (#5424)
* Some performance optimizations
This is globally removing some memory useless copy
* use a const ref return on std::string Settings::get to prevent data copy on getters which doesn't need to copy it
* pass some stack created strings to static const as they are not modified anywhere
* Camera: return nametags per const ref instead of a list pointer, we only need to read it
* INodeDefManager: getAll should be a result ref writer instead of a return copy
* INodeDefManager: getAlias should return a const std::string ref
* Minimap: unroll a Scolor creation in blitMinimapPixersToImageRadar to prvent many variable construct/destruct which are unneeded (we rewrite the content in the loop)
* CNodeDefManager::updateAliases: prevent a idef getall copy
* Profiler: constness
* rollback_interface: create real_name later, and use const ref
* MapBlockMesh updateFastFaceRow: unroll TileSpec next_tile, which has a cost of 1.8% CPU due to variable allocation/destruction,
* MapBlockMesh updateFastFaceRow: copy next_tile to tile only if it's a different tilespec
* MapBlockMesh updateFastFaceRow: use memcpy to copy next_lights to lights to do it in a single cpu operation
Diffstat (limited to 'src/rollback_interface.cpp')
| -rw-r--r-- | src/rollback_interface.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rollback_interface.cpp b/src/rollback_interface.cpp index 7345c4a7d..40a33a51d 100644 --- a/src/rollback_interface.cpp +++ b/src/rollback_interface.cpp @@ -190,7 +190,6 @@ bool RollbackAction::applyRevert(Map *map, InventoryManager *imgr, IGameDef *gam case TYPE_MODIFY_INVENTORY_STACK: { InventoryLocation loc; loc.deSerialize(inventory_location); - std::string real_name = gamedef->idef()->getAlias(inventory_stack.name); Inventory *inv = imgr->getInventory(loc); if (!inv) { infostream << "RollbackAction::applyRevert(): Could not get " @@ -211,10 +210,12 @@ bool RollbackAction::applyRevert(Map *map, InventoryManager *imgr, IGameDef *gam << inventory_location << std::endl; return false; } + // If item was added, take away item, otherwise add removed item if (inventory_add) { // Silently ignore different current item - if (list->getItem(inventory_index).name != real_name) + if (list->getItem(inventory_index).name != + gamedef->idef()->getAlias(inventory_stack.name)) return false; list->takeItem(inventory_index, inventory_stack.count); } else { |