[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.9,1.10 gfx.cpp,1.20,1.21 gui.cpp,1.3,1.4 resource.cpp,1.20,1.21 saveload.cpp,1.15,1.16 script_v1.cpp,1.13,1.14 script_v2.cpp,1.11,1.12 scumm.h,1.28,1.29 scummvm.cpp,1.26,1.27 verbs.cpp,1.9,1.10
Ludvig Strigeus
strigeus at users.sourceforge.net
Wed Nov 14 12:10:52 CET 2001
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv15814
Modified Files:
costume.cpp gfx.cpp gui.cpp resource.cpp saveload.cpp
script_v1.cpp script_v2.cpp scumm.h scummvm.cpp verbs.cpp
Log Message:
readability patch (janssen)
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** costume.cpp 2001/11/11 16:54:45 1.9
--- costume.cpp 2001/11/14 20:09:39 1.10
***************
*** 671,675 ****
void CostumeRenderer::loadCostume(int id) {
! _ptr = _vm->getResourceAddress(3, id);
if (_vm->_majorScummVersion == 6) {
--- 671,675 ----
void CostumeRenderer::loadCostume(int id) {
! _ptr = _vm->getResourceAddress(rtCostume, id);
if (_vm->_majorScummVersion == 6) {
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gfx.cpp 2001/11/14 18:37:38 1.20
--- gfx.cpp 2001/11/14 20:09:39 1.21
***************
*** 256,260 ****
CameraData *cd = &camera;
! if (cd->_mode!=2 || abs(dest - cd->_curPos) > 160) {
cd->_curPos = dest;
}
--- 256,260 ----
CameraData *cd = &camera;
! if (cd->_mode!=CM_FOLLOW_ACTOR || abs(dest - cd->_curPos) > 160) {
cd->_curPos = dest;
}
***************
*** 280,289 ****
CameraData *cd = &camera;
! cd->_mode = 2;
cd->_follows = a->number;
if (a->room != _currentRoom) {
startScene(a->room, 0, 0);
! cd->_mode = 2;
cd->_curPos = a->x;
setCameraAt(cd->_curPos);
--- 280,289 ----
CameraData *cd = &camera;
! cd->_mode = CM_FOLLOW_ACTOR;
cd->_follows = a->number;
if (a->room != _currentRoom) {
startScene(a->room, 0, 0);
! cd->_mode = CM_FOLLOW_ACTOR;
cd->_curPos = a->x;
setCameraAt(cd->_curPos);
***************
*** 1454,1458 ****
}
! if (cd->_mode==2) {
a = derefActorSafe(cd->_follows, "moveCamera");
--- 1454,1458 ----
}
! if (cd->_mode==CM_FOLLOW_ACTOR) {
a = derefActorSafe(cd->_follows, "moveCamera");
***************
*** 1521,1525 ****
CameraData *cd = &camera;
cd->_destPos = x;
! cd->_mode = 3;
cd->_movingToActor = 0;
}
--- 1521,1525 ----
CameraData *cd = &camera;
cd->_destPos = x;
! cd->_mode = CM_PANNING;
cd->_movingToActor = 0;
}
***************
*** 1531,1535 ****
/* mi1 compatibilty */
if (act==0) {
! cd->_mode = 1;
cd->_follows = 0;
cd->_movingToActor = 0;
--- 1531,1535 ----
/* mi1 compatibilty */
if (act==0) {
! cd->_mode = CM_NORMAL;
cd->_follows = 0;
cd->_movingToActor = 0;
***************
*** 1547,1551 ****
void Scumm::setCameraAtEx(int at) {
CameraData *cd = &camera;
! cd->_mode = 1;
cd->_curPos = at;
setCameraAt(at);
--- 1547,1551 ----
void Scumm::setCameraAtEx(int at) {
CameraData *cd = &camera;
! cd->_mode = CM_NORMAL;
cd->_curPos = at;
setCameraAt(at);
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gui.cpp 2001/11/14 18:37:38 1.3
--- gui.cpp 2001/11/14 20:09:39 1.4
***************
*** 465,469 ****
_s->getKeyInput(0);
! if (_s->_mouseButStat&0x8000) {
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
--- 465,469 ----
_s->getKeyInput(0);
! if (_s->_mouseButStat&MBS_LEFT_CLICK) {
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** resource.cpp 2001/11/14 18:37:38 1.20
--- resource.cpp 2001/11/14 20:09:39 1.21
***************
*** 572,576 ****
void Scumm::setResourceCounter(int type, int index, byte flag) {
! res.flags[type][index] &= 0x80;
res.flags[type][index] |= flag;
}
--- 572,576 ----
void Scumm::setResourceCounter(int type, int index, byte flag) {
! res.flags[type][index] &= ~RF_USAGE;
res.flags[type][index] |= flag;
}
***************
*** 664,668 ****
void Scumm::lock(int type, int i) {
validateResource("Locking", type, i);
! res.flags[type][i] |= 0x80;
// debug(1, "locking %d,%d", type, i);
--- 664,668 ----
void Scumm::lock(int type, int i) {
validateResource("Locking", type, i);
! res.flags[type][i] |= RF_LOCK;
// debug(1, "locking %d,%d", type, i);
***************
*** 671,675 ****
void Scumm::unlock(int type, int i) {
validateResource("Unlocking", type, i);
! res.flags[type][i] &= ~0x80;
// debug(1, "unlocking %d,%d", type, i);
--- 671,675 ----
void Scumm::unlock(int type, int i) {
validateResource("Unlocking", type, i);
! res.flags[type][i] &= ~RF_LOCK;
// debug(1, "unlocking %d,%d", type, i);
***************
*** 698,703 ****
for (i=rtFirst; i<=rtLast; i++) {
for(j=res.num[i]; --j>=0;) {
! counter = res.flags[i][j] & 0x7F;
! if (counter && counter < 0x7F) {
setResourceCounter(i, j, counter+1);
}
--- 698,703 ----
for (i=rtFirst; i<=rtLast; i++) {
for(j=res.num[i]; --j>=0;) {
! counter = res.flags[i][j] & RF_USAGE;
! if (counter && counter < RF_USAGE_MAX) {
setResourceCounter(i, j, counter+1);
}
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** saveload.cpp 2001/11/14 18:37:38 1.15
--- saveload.cpp 2001/11/14 20:09:39 1.16
***************
*** 475,479 ****
for (i=rtFirst; i<=rtLast; i++)
for(j=1; j<res.num[i]; j++) {
! if (res.flags[i][j]&0x80) {
s->saveByte(i);
s->saveWord(j);
--- 475,479 ----
for (i=rtFirst; i<=rtLast; i++)
for(j=1; j<res.num[i]; j++) {
! if (res.flags[i][j]&RF_LOCK) {
s->saveByte(i);
s->saveWord(j);
***************
*** 484,488 ****
int r;
while ((r = s->loadByte()) != 0xFF) {
! res.flags[r][s->loadWord()] |= 0x80;
}
}
--- 484,488 ----
int r;
while ((r = s->loadByte()) != 0xFF) {
! res.flags[r][s->loadWord()] |= RF_LOCK;
}
}
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** script_v1.cpp 2001/11/14 18:37:38 1.13
--- script_v1.cpp 2001/11/14 20:09:39 1.14
***************
*** 422,426 ****
break;
case 13: /* name */
! loadPtrToResource(9, a->number, NULL);
break;
case 14: /* initanim */
--- 422,426 ----
break;
case 13: /* name */
! loadPtrToResource(rtActorName, a->number, NULL);
break;
case 14: /* initanim */
***************
*** 1629,1633 ****
switch(_opcode&0x1F) {
case 1: /* loadstring */
! loadPtrToResource(7, getVarOrDirectByte(0x80), NULL);
break;
case 2: /* copystring */
--- 1629,1633 ----
switch(_opcode&0x1F) {
case 1: /* loadstring */
! loadPtrToResource(rtString, getVarOrDirectByte(0x80), NULL);
break;
case 2: /* copystring */
***************
*** 1641,1645 ****
a = getVarOrDirectByte(0x80);
b = getVarOrDirectByte(0x40);
! ptr = getResourceAddress(7, a);
if (ptr==NULL) error("String %d does not exist", a);
c = getVarOrDirectByte(0x20);
--- 1641,1645 ----
a = getVarOrDirectByte(0x80);
b = getVarOrDirectByte(0x40);
! ptr = getResourceAddress(rtString, a);
if (ptr==NULL) error("String %d does not exist", a);
c = getVarOrDirectByte(0x20);
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** script_v2.cpp 2001/11/14 18:37:38 1.11
--- script_v2.cpp 2001/11/14 20:09:39 1.12
***************
*** 1415,1419 ****
break;
case 88: /* actor-name */
! loadPtrToResource(9, a->number, NULL);
break;
case 89: /* actor-initframe */
--- 1415,1419 ----
break;
case 88: /* actor-name */
! loadPtrToResource(rtActorName, a->number, NULL);
break;
case 89: /* actor-initframe */
***************
*** 1493,1497 ****
break;
case 125:
! loadPtrToResource(8, slot, NULL);
vs->type = 0;
vs->imgindex = 0;
--- 1493,1497 ----
break;
case 125:
! loadPtrToResource(rtVerb, slot, NULL);
vs->type = 0;
vs->imgindex = 0;
***************
*** 1559,1563 ****
ptr = getStringAddress(a);
}
! loadPtrToResource(8, slot, ptr);
vs->type = 0;
vs->imgindex = 0;
--- 1559,1563 ----
ptr = getStringAddress(a);
}
! loadPtrToResource(rtVerb, slot, ptr);
vs->type = 0;
vs->imgindex = 0;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** scumm.h 2001/11/14 19:33:10 1.28
--- scumm.h 2001/11/14 20:09:39 1.29
***************
*** 338,341 ****
--- 338,361 ----
};
+ /* Camera Modes */
+ enum {
+ CM_NORMAL = 1,
+ CM_FOLLOW_ACTOR = 2,
+ CM_PANNING = 3,
+ };
+
+ enum {
+ MBS_LEFT_CLICK = 0x8000,
+ MBS_RIGHT_CLICK = 0x4000,
+ MBS_MOUSE_MASK = (MBS_LEFT_CLICK|MBS_RIGHT_CLICK),
+ MBS_MAX_KEY = 0x0200
+ };
+
+ enum {
+ RF_LOCK = 0x80,
+ RF_USAGE = 0x7F,
+ RF_USAGE_MAX = RF_USAGE
+ };
+
#define _maxRooms res.num[rtRoom]
#define _maxScripts res.num[rtScript]
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** scummvm.cpp 2001/11/14 18:37:38 1.26
--- scummvm.cpp 2001/11/14 20:09:39 1.27
***************
*** 533,537 ****
loadRoomObjects();
! camera._mode = 1;
camera._curPos = camera._destPos = 160;
--- 533,537 ----
loadRoomObjects();
! camera._mode = CM_NORMAL;
camera._curPos = camera._destPos = 160;
***************
*** 822,828 ****
_lastKeyHit = _vars[VAR_CUTSCENEEXIT_KEY];
} else if (_leftBtnPressed&1) {
! _mouseButStat = 0x8000;
} else if (_rightBtnPressed&1) {
! _mouseButStat = 0x4000;
}
--- 822,828 ----
_lastKeyHit = _vars[VAR_CUTSCENEEXIT_KEY];
} else if (_leftBtnPressed&1) {
! _mouseButStat = MBS_LEFT_CLICK;
} else if (_rightBtnPressed&1) {
! _mouseButStat = MBS_RIGHT_CLICK;
}
***************
*** 836,842 ****
if (_lastKeyHit && _cursorState>0) {
if (_lastKeyHit==9) {
! _mouseButStat = 0x4000;
} else if (_lastKeyHit==13) {
! _mouseButStat = 0x8000;
} else
return;
--- 836,842 ----
if (_lastKeyHit && _cursorState>0) {
if (_lastKeyHit==9) {
! _mouseButStat = MBS_RIGHT_CLICK;
} else if (_lastKeyHit==13) {
! _mouseButStat = MBS_LEFT_CLICK;
} else
return;
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** verbs.cpp 2001/11/12 20:50:36 1.9
--- verbs.cpp 2001/11/14 20:09:39 1.10
***************
*** 37,41 ****
return;
! if (_mouseButStat < 0x200) {
/* Check keypresses */
vs = &_verbs[1];
--- 37,41 ----
return;
! if (_mouseButStat < MBS_MAX_KEY) {
/* Check keypresses */
vs = &_verbs[1];
***************
*** 49,54 ****
}
runInputScript(4, _mouseButStat, 1);
! } else if (_mouseButStat&0xC000) {
! byte code = _mouseButStat&0x8000 ? 1 : 2;
if (mouse.y >= virtscr[0].topline && mouse.y < virtscr[0].topline + virtscr[0].height) {
over = checkMouseOver(mouse.x, mouse.y);
--- 49,54 ----
}
runInputScript(4, _mouseButStat, 1);
! } 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);
More information about the Scummvm-git-logs
mailing list