aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorlukaslw2014-06-10 20:18:49 +0200
committerlukaslw2014-06-22 20:08:57 +0200
commitee4c67e113511cd4d792b226e393f53d2324816f (patch)
treedba1611a56c6dbecdf3caabbab17ed574bb5f65f /engines
parent60f23ecb574369ea341773efba4b9bfa31577210 (diff)
downloadscummvm-rg350-ee4c67e113511cd4d792b226e393f53d2324816f.tar.gz
scummvm-rg350-ee4c67e113511cd4d792b226e393f53d2324816f.tar.bz2
scummvm-rg350-ee4c67e113511cd4d792b226e393f53d2324816f.zip
PRINCE: showObjects() - change to hex values
Diffstat (limited to 'engines')
-rw-r--r--engines/prince/prince.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 2707146b93..e8260c4faf 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1103,19 +1103,19 @@ void PrinceEngine::clearBackAnimList() {
void PrinceEngine::showObjects() {
if (!_objList.empty()) {
for (uint i = 0; i < _objList.size(); i++) {
- if ((_objList[i]->_mask & 32768) != 0) { // 8000h
+ if ((_objList[i]->_mask & 0x8000) != 0) {
_objList[i]->_zoomInTime--;
if (_objList[i]->_zoomInTime == 0) {
- _objList[i]->_mask &= 32767; //7FFFh
+ _objList[i]->_mask &= 0x7FFF;
} else {
// doZoomIn();
// mov edx, d [esi.Obj_ZoomInAddr]
}
}
- if ((_objList[i]->_mask & 16384) != 0) { // 4000h
+ if ((_objList[i]->_mask & 0x4000) != 0) {
_objList[i]->_zoomInTime--;
if (_objList[i]->_zoomInTime == 0) {
- _objList[i]->_mask &= 49151; //0BFFFh
+ _objList[i]->_mask &= 0xBFFF;
} else {
// doZoomOut();
// mov edx, d [esi.Obj_ZoomInAddr]
@@ -1123,7 +1123,7 @@ void PrinceEngine::showObjects() {
}
Graphics::Surface *objSurface = _objList[i]->getSurface();
if (spriteCheck(objSurface->w, objSurface->h, _objList[i]->_x, _objList[i]->_y)) {
- if ((_objList[i]->_mask & 512) == 0) { // 0200h
+ if ((_objList[i]->_mask & 0x0200) == 0) {
int destX = _objList[i]->_x - _picWindowX;
int destY = _objList[i]->_y - _picWindowY;
DrawNode newDrawNode;