[Scummvm-cvs-logs] CVS: scummvm/kyra seqplayer.cpp,1.1,1.2

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Oct 12 10:46:21 CEST 2005


Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20996

Modified Files:
	seqplayer.cpp 
Log Message:
I accidentally created this file with DOS line endings. I feel so dirty.


Index: seqplayer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/seqplayer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- seqplayer.cpp	6 Oct 2005 11:58:03 -0000	1.1
+++ seqplayer.cpp	12 Oct 2005 17:45:40 -0000	1.2
@@ -1,601 +1,601 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2004-2005 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
[...1171 lines suppressed...]
+			} else {
+				_seqDisplayedTextTimer = _system->getMillis() + 1000 / 60;
+			}
+		}
+
+		uint8 seqCode = *_seqData++;
+		if (seqCode < numCommands) {
+			SeqProc currentProc = commands[seqCode].proc;
+			debug(5, "seqCode = %d (%s)", seqCode, commands[seqCode].desc);
+			(this->*currentProc)();
+		} else {
+			error("Invalid sequence opcode %d", seqCode);
+		}
+
+		_screen->updateScreen();
+	}
+	return seqSkippedFlag;
+}
+
+} // End of namespace Kyra





More information about the Scummvm-git-logs mailing list