aboutsummaryrefslogtreecommitdiff
path: root/engines/prince/object.cpp
diff options
context:
space:
mode:
authorlukaslw2014-08-01 17:38:04 +0200
committerlukaslw2014-08-01 17:38:04 +0200
commit3c29d61f6705a6f05d86fa2599a6992d2d17e3ac (patch)
tree9c0033d66c9a1cbf1cb5c52ca27b8159d194d432 /engines/prince/object.cpp
parentb3589c76da856239828377a3011525a888b04920 (diff)
downloadscummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.tar.gz
scummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.tar.bz2
scummvm-rg350-3c29d61f6705a6f05d86fa2599a6992d2d17e3ac.zip
PRINCE: Code clean-up
Diffstat (limited to 'engines/prince/object.cpp')
-rw-r--r--engines/prince/object.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/prince/object.cpp b/engines/prince/object.cpp
index 7e4bd1bbee..a9a96455b1 100644
--- a/engines/prince/object.cpp
+++ b/engines/prince/object.cpp
@@ -25,7 +25,6 @@
#include "common/debug.h"
#include "common/stream.h"
-
#include "graphics/surface.h"
#include "prince/object.h"
@@ -65,8 +64,9 @@ void Object::loadSurface(Common::SeekableReadStream &stream) {
bool Object::loadFromStream(Common::SeekableReadStream &stream) {
int32 pos = stream.pos();
uint16 x = stream.readUint16LE();
- if (x == 0xFFFF)
+ if (x == 0xFFFF) {
return false;
+ }
_x = x;
_y = stream.readSint16LE(); // skull mini-game has some signed y coords
@@ -82,8 +82,6 @@ bool Object::loadFromStream(Common::SeekableReadStream &stream) {
stream.seek(pos + 16);
- //debug("Object x %d, y %d, z %d overlay %d", _x, _y, _z, _mask);
-
return true;
}
@@ -112,5 +110,4 @@ int32 Object::getData(AttrId dataId) {
}
}
-}
-/* vim: set tabstop=4 noexpandtab: */
+} // End of namespace Prince