[Scummvm-cvs-logs] CVS: scummvm Makefile,1.21,1.22 gui.cpp,1.8,1.9 resource.cpp,1.45,1.46 script.cpp,1.25,1.26 script_v2.cpp,1.25,1.26 scummvm.cpp,1.58,1.59 sound.cpp,1.21,1.22 string.cpp,1.25,1.26
Vincent Hamm
yazoo at users.sourceforge.net
Tue Mar 5 16:19:04 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.8,1.9 scummvm.cpp,1.57,1.58
- Next message: [Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.28,1.29 akos.cpp,1.6,1.7 gfx.cpp,1.38,1.39 object.cpp,1.33,1.34 script_v2.cpp,1.26,1.27 scumm.h,1.62,1.63 scummvm.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22098
Modified Files:
Makefile gui.cpp resource.cpp script.cpp script_v2.cpp
scummvm.cpp sound.cpp string.cpp
Log Message:
Final part of V7 merging process. The FULL_THROTTLE define is not required any more
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile 23 Feb 2002 23:23:28 -0000 1.21
--- Makefile 6 Mar 2002 00:18:22 -0000 1.22
***************
*** 3,7 ****
CC = gcc
CFLAGS = -g -Wno-multichar
! DEFINES = -DUNIX -DUSE_ADLIB
LDFLAGS :=
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
--- 3,7 ----
CC = gcc
CFLAGS = -g -Wno-multichar
! DEFINES = -DUNIX -DUSE_ADLIB
LDFLAGS :=
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gui.cpp 24 Feb 2002 17:25:02 -0000 1.8
--- gui.cpp 6 Mar 2002 00:18:22 -0000 1.9
***************
*** 459,465 ****
byte Gui::getDefaultColor(int color) {
! #if defined(FULL_THROTTLE)
! return 0;
! #else
if (_s->_features&GF_AFTER_V6) {
if (color==8) color=1;
--- 459,464 ----
byte Gui::getDefaultColor(int color) {
! if(_s->_features & GF_AFTER_V7)
! return 0;
if (_s->_features&GF_AFTER_V6) {
if (color==8) color=1;
***************
*** 468,472 ****
return _s->getStringAddress(21)[color];
}
- #endif
}
--- 467,470 ----
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** resource.cpp 5 Mar 2002 23:05:55 -0000 1.45
--- resource.cpp 6 Mar 2002 00:18:22 -0000 1.46
***************
*** 657,661 ****
total_size = fileReadDwordBE();
! if (_gameId==GID_SAMNMAX) {
if (basetag == MKID('MIDI')) {
fileSeek(_fileHandle, -8, SEEK_CUR);
--- 657,661 ----
total_size = fileReadDwordBE();
! if (_gameId==GID_SAMNMAX || _features & GF_AFTER_V7) {
if (basetag == MKID('MIDI')) {
fileSeek(_fileHandle, -8, SEEK_CUR);
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** script.cpp 5 Mar 2002 23:41:41 -0000 1.25
--- script.cpp 6 Mar 2002 00:18:22 -0000 1.26
***************
*** 255,259 ****
_scriptPointerStart = _scriptPointer;
vm.slot[_currentScript].didexec = 1;
! //debug(1, "[%X] %s()", _opcode, _opcodes_lookup[_opcode]);
op = getOpcode(_opcode);
(this->*op)();
--- 255,259 ----
_scriptPointerStart = _scriptPointer;
vm.slot[_currentScript].didexec = 1;
! // debug(1, "[%X] %s()", _opcode, _opcodes_lookup[_opcode]);
op = getOpcode(_opcode);
(this->*op)();
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** script_v2.cpp 5 Mar 2002 20:13:47 -0000 1.25
--- script_v2.cpp 6 Mar 2002 00:18:22 -0000 1.26
***************
*** 1190,1213 ****
void Scumm::o6_actorFollowCamera() {
! #if defined(FULL_THROTTLE)
! setCameraFollows(derefActorSafe(pop(), "actorFollowCamera"));
! #else
! actorFollowCamera(pop());
! #endif
}
void Scumm::o6_setCameraAt() {
! #if defined(FULL_THROTTLE)
! int x,y;
!
! camera._follows = 0;
! y = pop();
! x = pop();
! setCameraAt(x,y);
! #else
! setCameraAtEx(pop());
! #endif
}
--- 1190,1213 ----
void Scumm::o6_actorFollowCamera() {
! if(_features & GF_AFTER_V7)
! setCameraFollows(derefActorSafe(pop(), "actorFollowCamera"));
! else
! actorFollowCamera(pop());
!
}
void Scumm::o6_setCameraAt() {
! if(_features & GF_AFTER_V7) {
! int x,y;
! camera._follows = 0;
! y = pop();
! x = pop();
!
! setCameraAt(x,y);
! } else {
! setCameraAtEx(pop());
! }
}
***************
*** 1385,1392 ****
/* startScene maybe modifies VAR_EGO, i hope not */
! #if !defined(FULL_THROTTLE)
! camera._dest.x = camera._cur.x = a->x;
! setCameraFollows(a);
! #endif
_fullRedraw=1;
if (x != -1) {
--- 1385,1393 ----
/* startScene maybe modifies VAR_EGO, i hope not */
!
! if(!(_features & GF_AFTER_V7)) {
! camera._dest.x = camera._cur.x = a->x;
! setCameraFollows(a);
! }
_fullRedraw=1;
if (x != -1) {
***************
*** 1537,1544 ****
case 100: /* load script */
res = pop();
! #if defined(FULL_THROTTLE)
! if (res >= _numGlobalScripts)
! break;
! #endif
ensureResourceLoaded(rtScript, res);
break;
--- 1538,1544 ----
case 100: /* load script */
res = pop();
! if(_features & GF_AFTER_V7)
! if (res >= _numGlobalScripts)
! break;
ensureResourceLoaded(rtScript, res);
break;
***************
*** 1557,1564 ****
case 104: /* nuke script */
res = pop();
! #if defined(FULL_THROTTLE)
! if (res >= _numGlobalScripts)
! break;
! #endif
setResourceCounter(rtScript, res, 0x7F);
debug(5, "nuke script %d", res);
--- 1557,1563 ----
case 104: /* nuke script */
res = pop();
! if(_features & GF_AFTER_V7)
! if (res >= _numGlobalScripts)
! break;
setResourceCounter(rtScript, res, 0x7F);
debug(5, "nuke script %d", res);
***************
*** 2173,2184 ****
return;
case 170:
! #if !defined(FULL_THROTTLE)
! if (camera._cur.x>>3 != camera._dest.x>>3)
! break;
! #else
! if (camera._dest.x != camera._cur.x ||
! camera._dest.y != camera._cur.y)
break;
! #endif
return;
case 171:
--- 2172,2184 ----
return;
case 170:
! if(!(_features & GF_AFTER_V7)) {
! if (camera._cur.x>>3 != camera._dest.x>>3)
break;
! } else {
! if (camera._dest.x != camera._cur.x ||
! camera._dest.y != camera._cur.y)
! break;
! }
!
return;
case 171:
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** scummvm.cpp 6 Mar 2002 00:00:38 -0000 1.58
--- scummvm.cpp 6 Mar 2002 00:18:22 -0000 1.59
***************
*** 250,256 ****
scummInit();
! #if !defined(FULL_THROTTLE)
! _vars[VAR_VERSION] = 21;
! #endif
_vars[VAR_DEBUGMODE] = _debugMode;
--- 250,255 ----
scummInit();
! if(!(_features & GF_AFTER_V7))
! _vars[VAR_VERSION] = 21;
_vars[VAR_DEBUGMODE] = _debugMode;
***************
*** 284,293 ****
processKbd();
! #if defined(FULL_THROTTLE)
! _vars[VAR_CAMERA_POS_X] = camera._cur.x;
! _vars[VAR_CAMERA_POS_Y] = camera._cur.y;
! #else
! _vars[VAR_CAMERA_POS_X] = camera._cur.x;
! #endif
_vars[VAR_HAVE_MSG] = _haveMsg;
_vars[VAR_VIRT_MOUSE_X] = _virtual_mouse_x;
--- 283,292 ----
processKbd();
! if(_features & GF_AFTER_V7) {
! _vars[VAR_CAMERA_POS_X] = camera._cur.x;
! _vars[VAR_CAMERA_POS_Y] = camera._cur.y;
! } else {
! _vars[VAR_CAMERA_POS_X] = camera._cur.x;
! }
_vars[VAR_HAVE_MSG] = _haveMsg;
_vars[VAR_VIRT_MOUSE_X] = _virtual_mouse_x;
***************
*** 344,355 ****
fixObjectFlags();
CHARSET_1();
! #if !defined(FULL_THROTTLE)
! if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw) {
! #else
! if (camera._cur.x != camera._last.x ||
! camera._cur.y != camera._last.y || _BgNeedsRedraw ||
! _fullRedraw) {
! #endif
! redrawBGAreas();
}
processDrawQue();
--- 343,354 ----
fixObjectFlags();
CHARSET_1();
! if(!(_features & GF_AFTER_V7)) {
! if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw) {
! redrawBGAreas();
! }
! } else {
! if (camera._cur.x != camera._last.x || camera._cur.y != camera._last.y || _BgNeedsRedraw || _fullRedraw) {
! redrawBGAreas();
! }
}
processDrawQue();
***************
*** 616,623 ****
loadRoomObjects();
! #if !defined(FULL_THROTTLE)
! camera._mode = CM_NORMAL;
! camera._cur.x = camera._dest.x = 160;
! #endif
if (_features&GF_AFTER_V6) {
--- 615,622 ----
loadRoomObjects();
! if(!(_features & GF_AFTER_V7)) {
! camera._mode = CM_NORMAL;
! camera._cur.x = camera._dest.x = 160;
! }
if (_features&GF_AFTER_V6) {
***************
*** 626,639 ****
}
! #if defined(FULL_THROTTLE)
! _vars[VAR_CAMERA_MIN_X] = 160;
! _vars[VAR_CAMERA_MAX_X] = _scrWidth - 160;
! _vars[VAR_CAMERA_MIN_Y] = 100;
! _vars[VAR_CAMERA_MAX_Y] = _scrHeight - 100;
! setCameraAt(160, 100);
! #else
! _vars[VAR_CAMERA_MAX_X] = _scrWidth - 160;
! _vars[VAR_CAMERA_MIN_X] = 160;
! #endif
if (_roomResource == 0)
--- 625,638 ----
}
! if(_features & GF_AFTER_V7) {
! _vars[VAR_CAMERA_MIN_X] = 160;
! _vars[VAR_CAMERA_MAX_X] = _scrWidth - 160;
! _vars[VAR_CAMERA_MIN_Y] = 100;
! _vars[VAR_CAMERA_MAX_Y] = _scrHeight - 100;
! setCameraAt(160, 100);
! } else {
! _vars[VAR_CAMERA_MAX_X] = _scrWidth - 160;
! _vars[VAR_CAMERA_MIN_X] = 160;
! }
if (_roomResource == 0)
***************
*** 658,673 ****
runEntryScript();
! #if !defined(FULL_THROTTLE)
! if (a && !_egoPositioned) {
! getObjectXYPos(objectNr);
! putActor(a, _xPos, _yPos, _currentRoom);
! a->moving = 0;
! }
! #else
! if (camera._follows) {
! Actor *a = derefActorSafe(camera._follows, "startScene: follows");
! setCameraAt(a->x, a->y);
}
- #endif
_doEffect = true;
--- 657,672 ----
runEntryScript();
! if(!(_features & GF_AFTER_V7)) {
! if (a && !_egoPositioned) {
! getObjectXYPos(objectNr);
! putActor(a, _xPos, _yPos, _currentRoom);
! a->moving = 0;
! }
! } else {
! if (camera._follows) {
! Actor *a = derefActorSafe(camera._follows, "startScene: follows");
! setCameraAt(a->x, a->y);
! }
}
_doEffect = true;
***************
*** 802,813 ****
ptr += _resourceHeaderSize; /* skip tag & size */
! #ifdef FULL_THROTTLE
! id = READ_LE_UINT16(ptr);
! checkRange(2050, 2000, id, "Invalid local script %d");
! _localScriptList[id - _numGlobalScripts] = ptr + 2 - roomptr;
! #else
! id = ptr[0];
! _localScriptList[id - _numGlobalScripts] = ptr + 1 - roomptr;
! #endif
#ifdef DUMP_SCRIPTS
do {
--- 801,813 ----
ptr += _resourceHeaderSize; /* skip tag & size */
!
! if(_features & GF_AFTER_V7) {
! id = READ_LE_UINT16(ptr);
! checkRange(2050, 2000, id, "Invalid local script %d");
! _localScriptList[id - _numGlobalScripts] = ptr + 2 - roomptr;
! } else {
! id = ptr[0];
! _localScriptList[id - _numGlobalScripts] = ptr + 1 - roomptr;
! }
#ifdef DUMP_SCRIPTS
do {
***************
*** 1017,1026 ****
}
! #if defined(FULL_THROTTLE)
! // _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0;
! _vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed&msDown) != 0;
! // _vars[VAR_RIGHTBTN_DOWN] = (_rightBtnPressed&msClicked) != 0;
! _vars[VAR_RIGHTBTN_HOLD] = (_rightBtnPressed&msDown) != 0;
! #endif
_leftBtnPressed &= ~msClicked;
--- 1017,1026 ----
}
! if(_features & GF_AFTER_V7) {
! // _vars[VAR_LEFTBTN_DOWN] = (_leftBtnPressed&msClicked) != 0;
! _vars[VAR_LEFTBTN_HOLD] = (_leftBtnPressed&msDown) != 0;
! // _vars[VAR_RIGHTBTN_DOWN] = (_rightBtnPressed&msClicked) != 0;
! _vars[VAR_RIGHTBTN_HOLD] = (_rightBtnPressed&msDown) != 0;
! }
_leftBtnPressed &= ~msClicked;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** sound.cpp 5 Mar 2002 16:13:09 -0000 1.21
--- sound.cpp 6 Mar 2002 00:18:22 -0000 1.22
***************
*** 25,33 ****
void Scumm::addSoundToQueue(int sound) {
! #if !defined(FULL_THROTTLE)
! _vars[VAR_LAST_SOUND] = sound;
! ensureResourceLoaded(rtSound, sound);
! addSoundToQueue2(sound);
! #endif
if(_features & GF_AUDIOTRACKS)
--- 25,33 ----
void Scumm::addSoundToQueue(int sound) {
! if(!(_features & GF_AFTER_V7)) {
! _vars[VAR_LAST_SOUND] = sound;
! ensureResourceLoaded(rtSound, sound);
! addSoundToQueue2(sound);
! }
if(_features & GF_AUDIOTRACKS)
***************
*** 83,90 ****
);
#endif
! #if !defined(FULL_THROTTLE)
! if (se)
! _vars[VAR_SOUNDRESULT] = (short)se->do_command(data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]);
! #endif
}
}
--- 83,91 ----
);
#endif
! if(!(_features & GF_AFTER_V7)) {
! if (se)
! _vars[VAR_SOUNDRESULT] = (short)se->do_command(data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]);
! }
!
}
}
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** string.cpp 24 Feb 2002 17:25:02 -0000 1.25
--- string.cpp 6 Mar 2002 00:18:22 -0000 1.26
***************
*** 192,203 ****
byte *buffer;
! #if !defined(FULL_THROTTLE)
! if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
! camera._cur.x != camera._last.x
! ) return;
! #else
! if (!_haveMsg)
! return;
! #endif
a = NULL;
if (_vars[VAR_TALK_ACTOR] != 0xFF)
--- 192,204 ----
byte *buffer;
! if(!(_features & GF_AFTER_V7)) {
! if (!_haveMsg || (camera._dest.x>>3) != (camera._cur.x>>3) ||
! camera._cur.x != camera._last.x
! ) return;
! } else {
! if (!_haveMsg)
! return;
! }
!
a = NULL;
if (_vars[VAR_TALK_ACTOR] != 0xFF)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm readme.txt,1.8,1.9 scummvm.cpp,1.57,1.58
- Next message: [Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.28,1.29 akos.cpp,1.6,1.7 gfx.cpp,1.38,1.39 object.cpp,1.33,1.34 script_v2.cpp,1.26,1.27 scumm.h,1.62,1.63 scummvm.cpp,1.59,1.60
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list