diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2014-06-25 20:28:41 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2014-11-19 16:21:59 -0500 |
| commit | b1965ac20922e3722392114bd63a22b403dcbe98 (patch) | |
| tree | ab7ba20d23e01be920d7161fbfd20d2e265f2b70 /src/inventorymanager.cpp | |
| parent | da0f1e5497c7dece9ff5092adfb5881b0dd2e10c (diff) | |
| download | minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.gz minetest-b1965ac20922e3722392114bd63a22b403dcbe98.tar.bz2 minetest-b1965ac20922e3722392114bd63a22b403dcbe98.zip | |
Clean up rollback
Diffstat (limited to 'src/inventorymanager.cpp')
| -rw-r--r-- | src/inventorymanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 1ffcc3460..7486cc419 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -368,7 +368,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame */ if(!ignore_rollback && gamedef->rollback()) { - IRollbackReportSink *rollback = gamedef->rollback(); + IRollbackManager *rollback = gamedef->rollback(); // If source is not infinite, record item take if(src_can_take_count != -1){ @@ -380,7 +380,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame loc = os.str(); } action.setModifyInventoryStack(loc, from_list, from_i, false, - src_item.getItemString()); + src_item); rollback->reportAction(action); } // If destination is not infinite, record item put @@ -393,7 +393,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame loc = os.str(); } action.setModifyInventoryStack(loc, to_list, to_i, true, - src_item.getItemString()); + src_item); rollback->reportAction(action); } } @@ -632,7 +632,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame */ if(!ignore_src_rollback && gamedef->rollback()) { - IRollbackReportSink *rollback = gamedef->rollback(); + IRollbackManager *rollback = gamedef->rollback(); // If source is not infinite, record item take if(src_can_take_count != -1){ @@ -644,7 +644,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame loc = os.str(); } action.setModifyInventoryStack(loc, from_list, from_i, - false, src_item.getItemString()); + false, src_item); rollback->reportAction(action); } } |