[Scummvm-cvs-logs] SF.net SVN: scummvm: [24030] scummvm/trunk/engines/agos

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sat Sep 30 09:15:29 CEST 2006


Revision: 24030
          http://svn.sourceforge.net/scummvm/?rev=24030&view=rev
Author:   kirben
Date:     2006-09-30 00:15:19 -0700 (Sat, 30 Sep 2006)

Log Message:
-----------
Enable more code in oops functions of PP

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/event.cpp
    scummvm/trunk/engines/agos/items.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-09-30 07:06:55 UTC (rev 24029)
+++ scummvm/trunk/engines/agos/agos.h	2006-09-30 07:15:19 UTC (rev 24030)
@@ -1085,6 +1085,7 @@
 	bool itemIsParentOf(uint16 a, uint16 b);
 	bool vc_maybe_skip_proc_1(uint16 a, int16 b);
 
+	bool isVgaQueueEmpty();
 	void addVgaEvent(uint16 num, const byte *code_ptr, uint16 cur_sprite, uint16 curZoneNum, int32 param = 0);
 	void deleteVgaEvent(VgaTimerEntry * vte);
 	void processVgaEvents();

Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp	2006-09-30 07:06:55 UTC (rev 24029)
+++ scummvm/trunk/engines/agos/event.cpp	2006-09-30 07:15:19 UTC (rev 24030)
@@ -141,6 +141,10 @@
 	return result;
 }
 
+bool AGOSEngine::isVgaQueueEmpty() {
+	return true;
+}
+
 void AGOSEngine::addVgaEvent(uint16 num, const byte *code_ptr, uint16 cur_sprite, uint16 curZoneNum, int32 param) {
 	VgaTimerEntry *vte;
 

Modified: scummvm/trunk/engines/agos/items.cpp
===================================================================
--- scummvm/trunk/engines/agos/items.cpp	2006-09-30 07:06:55 UTC (rev 24029)
+++ scummvm/trunk/engines/agos/items.cpp	2006-09-30 07:15:19 UTC (rev 24030)
@@ -2568,13 +2568,16 @@
 
 void AGOSEngine::o4_restoreOopsPosition() {
 	// 32: restore oops position
+	uint i;
+
 	getNextItemPtr();
+
 	if (_oopsValid) {
-		for (uint i = 0; i < _numVars; i++) {
+		for (i = 0; i < _numVars; i++) {
 			_variableArray[i] = _variableArray2[i];
 		}
-//		i=FlagData[999]*100+11;
-//		C_PICTURE(4,i);
+		i = _variableArray[999] * 100 + 11;
+		set_video_mode_internal(4,i);
 		if (getBitFlag(110)) {
 			_gameTime += 10;
 		} else {
@@ -2641,13 +2644,14 @@
 
 void AGOSEngine::o4_saveOopsPosition() {
 	// 173: save oops position
-//	if (IsVQueueEmpty() == 0) {
+	if (!isVgaQueueEmpty()) {
 		_oopsValid = true;
 		for (uint i = 0; i < _numVars; i++) {
 			_variableArray2[i] = _variableArray[i];
 		}
-//	} else
-//		_oopsValid = false;
+	} else {
+		_oopsValid = false;
+	}
 }
 
 void AGOSEngine::o4_resetGameTime() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list