[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.14,1.15 akos.h,1.4,1.5

James Brown ender at users.sourceforge.net
Tue Oct 22 03:38:02 CEST 2002


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

Modified Files:
	akos.cpp akos.h 
Log Message:
ludde's akos 16 cleanup and mods - fixes the full throttle dumpster animation too 


Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- akos.cpp	22 Oct 2002 09:52:14 -0000	1.14
+++ akos.cpp	22 Oct 2002 10:37:08 -0000	1.15
@@ -1,1737 +1,1713 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001/2002 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
[...3419 lines suppressed...]
+}
+
+
+bool Scumm::akos_compare(int a, int b, byte cmd)
+{
+	switch (cmd) {
+	case 0:
+		return a == b;
+	case 1:
+		return a != b;
+	case 2:
+		return a < b;
+	case 3:
+		return a <= b;
+	case 4:
+		return a > b;
+	default:
+		return a >= b;
+	}
+}

Index: akos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- akos.h	22 Oct 2002 07:25:26 -0000	1.4
+++ akos.h	22 Oct 2002 10:37:08 -0000	1.5
@@ -126,7 +126,7 @@
 	void c1_spec2();
 	void c1_spec3();
 	void akos16SetupBitReader(byte *src);
-	void akos16PutOnScreen(byte * dest, byte * src, int32 transparency, int32 count);
+	void akos16PutOnScreen(byte * dest, byte * src, byte transparency, int32 count);
 	void akos16SkipData(int32 numskip);
 	void akos16DecodeLine(byte *buf, int32 numbytes, int32 dir);
 	void akos16ApplyMask(byte * dest, byte * maskptr, byte bits, int32 count, byte fillwith);





More information about the Scummvm-git-logs mailing list