summaryrefslogtreecommitdiff
path: root/src/inventory.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-11-15 21:00:39 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-11-29 19:13:44 +0200
commitba762bcd49c9f3ffa3cc4ecac73b13365c2047ec (patch)
tree434f3a74df5dd382434df5b655fee7843e45e004 /src/inventory.h
parent6da8cb00e27106221e013aa6d93965b95e630a18 (diff)
downloadminetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.tar.gz
minetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.tar.bz2
minetest-ba762bcd49c9f3ffa3cc4ecac73b13365c2047ec.zip
Clean mapnode.h and fix other files accordingly
Diffstat (limited to 'src/inventory.h')
-rw-r--r--src/inventory.h23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/inventory.h b/src/inventory.h
index 29b97ccad..5401ff1b9 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -520,27 +520,8 @@ struct IMoveAction : public InventoryAction
from_i = -1;
to_i = -1;
}
- IMoveAction(std::istream &is)
- {
- std::string ts;
-
- std::getline(is, ts, ' ');
- count = stoi(ts);
-
- std::getline(is, from_inv, ' ');
-
- std::getline(is, from_list, ' ');
-
- std::getline(is, ts, ' ');
- from_i = stoi(ts);
-
- std::getline(is, to_inv, ' ');
-
- std::getline(is, to_list, ' ');
-
- std::getline(is, ts, ' ');
- to_i = stoi(ts);
- }
+
+ IMoveAction(std::istream &is);
u16 getType() const
{