[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.58,1.59 script.cpp,1.49,1.50 script_v1.cpp,1.84,1.85 scumm.h,1.129,1.130 scummvm.cpp,1.118,1.119

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv25649

Modified Files:
	object.cpp script.cpp script_v1.cpp scumm.h scummvm.cpp 
Log Message:
Refixed getActorY in indy3. Fixed class (dunno if the fix doesn't break something else. Fixed intro by slowing down music rate by 3.

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** object.cpp	19 Apr 2002 16:26:43 -0000	1.58
--- object.cpp	19 Apr 2002 21:06:49 -0000	1.59
***************
*** 44,48 ****
  	cls &= 0x7F;
  	checkRange(32, 1, cls, "Class %d out of range in getClass");
! 
  	if (_features & GF_SMALL_HEADER) {
  		if (cls == 32)							// CLASS_TOUCHABLE
--- 44,48 ----
  	cls &= 0x7F;
  	checkRange(32, 1, cls, "Class %d out of range in getClass");
! 
  	if (_features & GF_SMALL_HEADER) {
  		if (cls == 32)							// CLASS_TOUCHABLE

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** script.cpp	19 Apr 2002 18:05:26 -0000	1.49
--- script.cpp	19 Apr 2002 21:06:50 -0000	1.50
***************
*** 273,277 ****
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		debug(1, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]);
  		op = getOpcode(_opcode);
  		(this->*op) ();
--- 273,277 ----
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		//debug(1, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]);
  		op = getOpcode(_opcode);
  		(this->*op) ();

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** script_v1.cpp	19 Apr 2002 19:32:43 -0000	1.84
--- script_v1.cpp	19 Apr 2002 21:06:50 -0000	1.85
***************
*** 828,845 ****
  
  			if( _features & GF_SMALL_HEADER)
- 
  			{
- 
  				Actor *a;
- 
  				a=derefActor(act);
- 
  				a->forceClip=0;
- 
  			}
- 
  				
  			continue;
  		}
  
  		if (newClass & 0x80)
--- 828,842 ----
  
  			if( _features & GF_SMALL_HEADER)
  			{
  				Actor *a;
  				a=derefActor(act);
  				a->forceClip=0;
  			}
  				
  			continue;
  		}
+ 
+ 		if(_gameId == GID_INDY3_256)
+ 			newClass--;
  
  		if (newClass & 0x80)
***************
*** 1324,1328 ****
  	else
  		actor = getVarOrDirectWord(0x80);
! 	setResult(actor);
  }
  
--- 1321,1325 ----
  	else
  		actor = getVarOrDirectWord(0x80);
! 	setResult(getObjY(actor));
  }
  
***************
*** 2210,2214 ****
  
  void Scumm::o5_startMusic()
! {
  	addSoundToQueue(getVarOrDirectByte(0x80));
  }
--- 2207,2211 ----
  
  void Scumm::o5_startMusic()
! {
  	addSoundToQueue(getVarOrDirectByte(0x80));
  }
***************
*** 2248,2251 ****
--- 2245,2249 ----
  void Scumm::o5_startSound()
  {
+ 	_vars[VAR_MUSIC_FLAG]=0;
  	addSoundToQueue(getVarOrDirectByte(0x80));
  }
***************
*** 2506,2512 ****
  		return;
  	case 2:											/* wait for message */
- 		if ((_currentRoom == 0) && (_gameId == GID_ZAK256))	// Bypass Zak256 script hang
- 			return;
- 
  		if (_vars[VAR_HAVE_MSG])
  			break;
--- 2504,2507 ----

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** scumm.h	19 Apr 2002 15:02:14 -0000	1.129
--- scumm.h	19 Apr 2002 21:06:50 -0000	1.130
***************
*** 958,962 ****
  	uint16 _mouthSyncTimes[52];
  	uint _curSoundPos;
! 	int current_cd_sound;
  
  #ifdef COMPRESSED_SOUND_FILE
--- 958,963 ----
  	uint16 _mouthSyncTimes[52];
  	uint _curSoundPos;
! 	int current_cd_sound;
! 	int tempMusic;
  
  #ifdef COMPRESSED_SOUND_FILE

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** scummvm.cpp	19 Apr 2002 11:05:46 -0000	1.118
--- scummvm.cpp	19 Apr 2002 21:06:50 -0000	1.119
***************
*** 53,56 ****
--- 53,58 ----
  	int i;
  	Actor *a;
+ 
+ 	tempMusic=0;
  
  	debug(9, "scummInit");
***************
*** 252,258 ****
  			}				
  		}
! 	} else if (_features & GF_OLD256)
! 		_vars[VAR_MUSIC_FLAG]++;		// ENDERFIX
! 
  	if (_saveLoadFlag) {
  		if (_saveLoadFlag == 1) {
--- 254,270 ----
  			}				
  		}
! 	} else if (_features & GF_OLD256)
! 	{
! 		if(tempMusic == 3)
! 		{
! 			tempMusic = 0;
! 			_vars[VAR_MUSIC_FLAG]++;
! 		}
! 		else
! 		{
! 			tempMusic ++;
! 		}
! 	}
! 
  	if (_saveLoadFlag) {
  		if (_saveLoadFlag == 1) {