aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus/items/itemlist.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2011-09-24 14:10:54 -0400
committerMatthew Hoops2011-09-24 14:10:54 -0400
commit59f7e1deeaa15c87adbe073105ea512d1972cde0 (patch)
tree7f39d7d8beba4df409ea18f681ce3029e308195e /engines/pegasus/items/itemlist.cpp
parente5a2dec9c803f75f7aa0f695235e0c08a6d5e7eb (diff)
downloadscummvm-rg350-59f7e1deeaa15c87adbe073105ea512d1972cde0.tar.gz
scummvm-rg350-59f7e1deeaa15c87adbe073105ea512d1972cde0.tar.bz2
scummvm-rg350-59f7e1deeaa15c87adbe073105ea512d1972cde0.zip
PEGASUS: Import AI code and relevant items
Diffstat (limited to 'engines/pegasus/items/itemlist.cpp')
-rwxr-xr-xengines/pegasus/items/itemlist.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/engines/pegasus/items/itemlist.cpp b/engines/pegasus/items/itemlist.cpp
index 2b980d6f5f..cbe48285e9 100755
--- a/engines/pegasus/items/itemlist.cpp
+++ b/engines/pegasus/items/itemlist.cpp
@@ -40,32 +40,22 @@ ItemList::ItemList() {
ItemList::~ItemList() {
}
-Common::Error ItemList::writeToStream(Common::WriteStream *stream) {
+void ItemList::writeToStream(Common::WriteStream *stream) {
stream->writeUint32BE(size());
for (ItemIterator it = begin(); it != end(); it++) {
stream->writeUint16BE((*it)->getObjectID());
(*it)->writeToStream(stream);
}
-
- if (stream->err())
- return Common::kWritingFailed;
-
- return Common::kNoError;
}
-Common::Error ItemList::readFromStream(Common::ReadStream *stream) {
+void ItemList::readFromStream(Common::ReadStream *stream) {
uint32 itemCount = stream->readUint32BE();
for (uint32 i = 0; i < itemCount; i++) {
tItemID itemID = stream->readUint16BE();
g_allItems.findItemByID(itemID)->readFromStream(stream);
}
-
- if (stream->err())
- return Common::kReadingFailed;
-
- return Common::kNoError;
}
Item *ItemList::findItemByID(const tItemID id) {