[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.252,2.253 actor.cpp,1.310,1.311 player_v2.cpp,2.49,2.50 player_mod.cpp,2.15,2.16
Max Horn
fingolfin at users.sourceforge.net
Mon Oct 11 15:29:33 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.58,1.59 ym2612.cpp,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.311,1.312 actor.h,1.73,1.74 akos.cpp,1.196,1.197 base-costume.h,1.31,1.32 script_v100he.cpp,2.12,2.13 script_v72he.cpp,2.168,2.169
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17241
Modified Files:
script_v2.cpp actor.cpp player_v2.cpp player_mod.cpp
Log Message:
cleanup / updated some comments
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.252
retrieving revision 2.253
diff -u -d -r2.252 -r2.253
--- script_v2.cpp 28 Sep 2004 19:28:58 -0000 2.252
+++ script_v2.cpp 11 Oct 2004 22:27:25 -0000 2.253
@@ -447,7 +447,7 @@
// script 164. Unfortunatly, when New Kid is reenabled (var[175] = 0) in
// script 89, script 164 isn't reran to redraw it. Why? Dunno. Hack? Yes.
if ((var == 175) && (_gameId == GID_MANIAC) && (vm.slot[_currentScript].number == 89))
- runScript(164, 0, 0, 0);
+ runScript(164, 0, 0, 0);
}
void ScummEngine_v2::getResultPosIndirect() {
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- actor.cpp 7 Oct 2004 21:23:29 -0000 1.310
+++ actor.cpp 11 Oct 2004 22:27:25 -0000 1.311
@@ -589,10 +589,9 @@
_vm->stopTalk();
}
- // HACK: The green transparency of the tank in the Hall of Oddities is
+ // WORKAROUND: The green transparency of the tank in the Hall of Oddities is
// is positioned one pixel too far to the left. This appears to be a
// bug in the original game as well.
-
if (_vm->_gameId == GID_SAMNMAX && newRoom == 16 && number == 5 && dstX == 235 && dstY == 236)
dstX++;
@@ -1491,8 +1490,6 @@
Common::Point foundPath;
if (_vm->_version >= 7) {
- // FIXME - this is kind of a hack right now but it fixes the
- // walk scripts in The Dig.
if (moving & MF_FROZEN) {
if (moving & MF_TURN) {
new_dir = updateActorDirection(false);
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.49
retrieving revision 2.50
diff -u -d -r2.49 -r2.50
--- player_v2.cpp 5 Mar 2004 14:35:16 -0000 2.49
+++ player_v2.cpp 11 Oct 2004 22:27:26 -0000 2.50
@@ -382,7 +382,7 @@
Player_V2::~Player_V2() {
mutex_up();
// Detach the premix callback handler
- _mixer->setupPremix(0, 0);
+ _mixer->setupPremix(0);
mutex_down();
_system->deleteMutex (_mutex);
}
@@ -537,10 +537,6 @@
}
-void Player_V2::premix_proc(void *param, int16 *buf, uint len) {
- ((Player_V2 *) param)->do_mix(buf, len);
-}
-
void Player_V2::clear_channel(int i) {
ChannelInfo *channel = &_channels[i];
memset(channel, 0, sizeof(ChannelInfo));
@@ -796,6 +792,10 @@
}
}
+void Player_V2::premix_proc(void *param, int16 *buf, uint len) {
+ ((Player_V2 *) param)->do_mix(buf, len);
+}
+
void Player_V2::do_mix(int16 *data, uint len) {
mutex_up();
uint step;
Index: player_mod.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- player_mod.cpp 24 Feb 2004 22:39:39 -0000 2.15
+++ player_mod.cpp 11 Oct 2004 22:27:26 -0000 2.16
@@ -51,7 +51,7 @@
Player_MOD::~Player_MOD() {
// Detach the premix callback handler
- _mixer->setupPremix(0, 0);
+ _mixer->setupPremix(0);
for (int i = 0; i < MOD_MAXCHANS; i++) {
if (!_channels[i].id)
continue;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.58,1.59 ym2612.cpp,1.24,1.25
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.311,1.312 actor.h,1.73,1.74 akos.cpp,1.196,1.197 base-costume.h,1.31,1.32 script_v100he.cpp,2.12,2.13 script_v72he.cpp,2.168,2.169
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list