Ticket #7918: more_readability.patch

costume.cpp

@@ -670 +670 @@
 }
 
 void CostumeRenderer::loadCostume(int id) {
-        _ptr = _vm->getResourceAddress(3, id);
+        _ptr = _vm->getResourceAddress(rtCostume, id);
         
         if (_vm->_majorScummVersion == 6) {
                 _ptr += 8;

gfx.cpp

@@ -255 +255 @@
         int t;
         CameraData *cd = &camera;
 
-        if (cd->_mode!=2 || abs(dest - cd->_curPos) > 160) {
+        if (cd->_mode!=CM_FOLLOW_ACTOR || abs(dest - cd->_curPos) > 160) {
                 cd->_curPos = dest;
         }
         cd->_destPos = dest;
@@ -279 +279 @@
         int t,i;
         CameraData *cd = &camera;
 
-        cd->_mode = 2;
+        cd->_mode = CM_FOLLOW_ACTOR;
         cd->_follows = a->number;
 
         if (a->room != _currentRoom) {
                 startScene(a->room, 0, 0);
-                cd->_mode = 2;
+                cd->_mode = CM_FOLLOW_ACTOR;
                 cd->_curPos = a->x;
                 setCameraAt(cd->_curPos);
         }
@@ -1453 +1453 @@
                 return;
         }
 
-        if (cd->_mode==2) {
+        if (cd->_mode==CM_FOLLOW_ACTOR) {
                 a = derefActorSafe(cd->_follows, "moveCamera");
                 
                 actorx = a->x;
@@ -1520 +1520 @@
 void Scumm::panCameraTo(int x) {
         CameraData *cd = &camera;
         cd->_destPos = x;
-        cd->_mode = 3;
+        cd->_mode = CM_PANNING;
         cd->_movingToActor = 0;
 }
 
@@ -1530 +1530 @@
 
         /* mi1 compatibilty */
         if (act==0) {
-                cd->_mode = 1;
+                cd->_mode = CM_NORMAL;
                 cd->_follows = 0;
                 cd->_movingToActor = 0;
                 return;
@@ -1546 +1546 @@
 
 void Scumm::setCameraAtEx(int at) {
         CameraData *cd = &camera;
-        cd->_mode = 1;
+        cd->_mode = CM_NORMAL;
         cd->_curPos = at;
         setCameraAt(at);
         cd->_movingToActor = 0;

gui.cpp

@@ -450 +450 @@
         }
         
         _s->getKeyInput(0);
-        if (_s->_mouseButStat&0x8000) {
+        if (_s->_mouseButStat&MBS_LEFT_CLICK) {
                 leftMouseClick(_s->mouse.x, _s->mouse.y);
         } else if (_s->_lastKeyHit) {
                 addLetter(_s->_lastKeyHit);

object.cpp

@@ -758 +758 @@
                 cdhd = (CodeHeader*)findResource(MKID('CDHD'), obim, 0);
                 imhd = (ImageHeader*)findResource(MKID('IMHD'), ptr, 0);
         } else {
-                ensureResourceLoaded(1, room);
-                roomptr = getResourceAddress(1, room);
+                ensureResourceLoaded(rtRoom, room);
+                roomptr = getResourceAddress(rtRoom, room);
                 rmhd = (RoomHeader*)findResource(MKID('RMHD'), roomptr, 0);
 
                 numobj = READ_LE_UINT16(&rmhd->numObjects);
@@ -881 +881 @@
         _lastXstart = vs->xstart;
 
         if (eo->l==0) {
-                roomptr = getResourceAddress(1, _roomResource);
+                roomptr = getResourceAddress(rtRoom, _roomResource);
                 index = getObjectIndex(eo->a);
                 ptr = roomptr + _objs[index].offs_obim_to_room;
         } else if (eo->a!=0) {

resource.cpp

@@ -395 +395 @@
 
         checkRange(_maxCharsets-1, 1, no, "Loading illegal charset %d");
 //      ensureResourceLoaded(6, no);
-        ptr = getResourceAddress(6, no);
+        ptr = getResourceAddress(rtCharset, no);
 
         for (i=0; i<15; i++) {
                 _charsetData[no][i+1] = ptr[i+14];
@@ -571 +571 @@
 }
 
 void Scumm::setResourceCounter(int type, int index, byte flag) {
-        res.flags[type][index] &= 0x80;
+        res.flags[type][index] &= RF_LOCK;
         res.flags[type][index] |= flag;
 }
 
@@ -663 +663 @@
 
 void Scumm::lock(int type, int i) {
         validateResource("Locking", type, i);
-        res.flags[type][i] |= 0x80;
+        res.flags[type][i] |= RF_LOCK;
 
 //      debug(1, "locking %d,%d", type, i);
 }
 
 void Scumm::unlock(int type, int i) {
         validateResource("Unlocking", type, i);
-        res.flags[type][i] &= ~0x80;
+        res.flags[type][i] &= ~RF_LOCK;
 
 //      debug(1, "unlocking %d,%d", type, i);
 }
@@ -697 +697 @@
 
         for (i=rtFirst; i<=rtLast; i++) {
                 for(j=res.num[i]; --j>=0;) {
-                        counter = res.flags[i][j] & 0x7F;
-                        if (counter && counter < 0x7F) {
+                        counter = res.flags[i][j] & ~RF_LOCK;
+                        if (counter && counter < ~RF_LOCK) {
                                 setResourceCounter(i, j, counter+1);
                         }
                 }

saveload.cpp

@@ -466 +466 @@
         if (s->isSaving()) {
                 for (i=rtFirst; i<=rtLast; i++)
                         for(j=1; j<res.num[i]; j++) {
-                                if (res.flags[i][j]&0x80) {
+                                if (res.flags[i][j]&RF_LOCK) {
                                         s->saveByte(i);
                                         s->saveWord(j);
                                 }
@@ -475 +475 @@
         } else {
                 int r;
                 while ((r = s->loadByte()) != 0xFF) {
-                        res.flags[r][s->loadWord()] |= 0x80;
+                        res.flags[r][s->loadWord()] |= RF_LOCK;
                 }
         }
 }

script_v1.cpp

@@ -1640 +1640 @@
         case 3: /* set string char */
                 a = getVarOrDirectByte(0x80);
                 b = getVarOrDirectByte(0x40);
-                ptr = getResourceAddress(7, a);
+                ptr = getResourceAddress(rtString, a);
                 if (ptr==NULL) error("String %d does not exist", a);
                 c = getVarOrDirectByte(0x20);
                 ptr[b] = c;

scumm.h

@@ -330 +330 @@
         OF_STATE_SHL = 4
 };
 
+enum {
+        MBS_LEFT_CLICK = 0x8000,
+        MBS_RIGHT_CLICK = 0x4000,
+        MBS_MOUSE_MASK = 0xC000,
+        MBS_MAX_KEY     = 0x0200
+};
+
+enum {
+        RF_LOCK = 0x80
+};
+
+enum {
+        CM_NORMAL = 1,
+        CM_FOLLOW_ACTOR = 2,
+        CM_PANNING = 3,
+};
+
 #define _maxRooms res.num[rtRoom]
 #define _maxScripts res.num[rtScript]
 #define _maxCostumes res.num[rtCostume]

scummvm.cpp

@@ -815 +815 @@
                 _mouseButStat = 0;
                 _lastKeyHit = _vars[VAR_CUTSCENEEXIT_KEY];
         } else if (_leftBtnPressed&1) {
-                _mouseButStat = 0x8000;
+                _mouseButStat = MBS_LEFT_CLICK;
         } else if (_rightBtnPressed&1) {
-                _mouseButStat = 0x4000;
+                _mouseButStat = MBS_RIGHT_CLICK;
         }
         
         _leftBtnPressed &= ~1;
@@ -829 +829 @@
 void Scumm::convertKeysToClicks() {
         if (_lastKeyHit && _cursorState>0) {
                 if (_lastKeyHit==9) {
-                        _mouseButStat = 0x4000;
+                        _mouseButStat = MBS_RIGHT_CLICK;
                 }       else if (_lastKeyHit==13) {
-                        _mouseButStat = 0x8000; 
+                        _mouseButStat = MBS_LEFT_CLICK; 
                 } else
                         return;
                 _lastKeyHit = 0;

verbs.cpp

@@ -36 +36 @@
         if (_userPut<=0 || _mouseButStat==0)
                 return;
 
-        if (_mouseButStat < 0x200) {
+        if (_mouseButStat < MBS_MAX_KEY) {
                 /* Check keypresses */
                 vs = &_verbs[1];
                 for (i=1; i<_maxVerbs; i++,vs++) {
@@ -48 +48 @@
                         }
                 }
                 runInputScript(4, _mouseButStat, 1);
-        } else if (_mouseButStat&0xC000) {
-                byte code = _mouseButStat&0x8000 ? 1 : 2;
+        } else if (_mouseButStat&MBS_MOUSE_MASK) {
+                byte code = _mouseButStat&MBS_LEFT_CLICK ? 1 : 2;
                 if (mouse.y >= virtscr[0].topline && mouse.y < virtscr[0].topline + virtscr[0].height) {
                         over = checkMouseOver(mouse.x, mouse.y);
                         if (over != 0) {