[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,1.33,1.34

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Mar 12 08:05:55 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26538

Modified Files:
	dimuse_music.cpp 
Log Message:
backport fix from residual imuse

Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- dimuse_music.cpp	1 Jan 2005 16:09:17 -0000	1.33
+++ dimuse_music.cpp	12 Mar 2005 16:05:25 -0000	1.34
@@ -157,12 +157,12 @@
 				atribPos = table->atribPos;
 			hookId = _attributes[DIG_STATE_OFFSET + atribPos];
 			if (table->hookId != 0) {
-				if ((hookId != 0) && (table->hookId <= 1)) {
+				if ((hookId != 0) && (table->hookId > 1)) {
+					_attributes[DIG_STATE_OFFSET + atribPos] = 2;
+				} else {
 					_attributes[DIG_STATE_OFFSET + atribPos] = hookId + 1;
 					if (table->hookId < hookId + 1)
 						_attributes[DIG_STATE_OFFSET + atribPos] = 1;
-				} else {
-					_attributes[DIG_STATE_OFFSET + atribPos] = 2;
 				}
 			}
 		}
@@ -274,12 +274,12 @@
 			atribPos = table->atribPos;
 		hookId = _attributes[COMI_STATE_OFFSET + atribPos];
 		if (table->hookId != 0) {
-			if ((hookId != 0) && (table->hookId <= 1)) {
+			if ((hookId != 0) && (table->hookId > 1)) {
+				_attributes[COMI_STATE_OFFSET + atribPos] = 2;
+			} else {
 				_attributes[COMI_STATE_OFFSET + atribPos] = hookId + 1;
 				if (table->hookId < hookId + 1)
 					_attributes[COMI_STATE_OFFSET + atribPos] = 1;
-			} else {
-				_attributes[COMI_STATE_OFFSET + atribPos] = 2;
 			}
 		}
 	}





More information about the Scummvm-git-logs mailing list