[Scummvm-cvs-logs] SF.net SVN: scummvm: [26278] scummvm/trunk/engines/agi

[sev at users.sourceforge.net]

Revision: 26278
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26278&view=rev
Author:   sev
Date:     2007-03-22 15:29:00 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
- Save AGIPAL resource number properly
- Move GfxMgr constructor to .cpp file

Modified Paths:
--------------
    scummvm/trunk/engines/agi/graphics.cpp
    scummvm/trunk/engines/agi/graphics.h
    scummvm/trunk/engines/agi/savegame.cpp

Modified: scummvm/trunk/engines/agi/graphics.cpp
===================================================================
--- scummvm/trunk/engines/agi/graphics.cpp	2007-03-22 22:03:21 UTC (rev 26277)
+++ scummvm/trunk/engines/agi/graphics.cpp	2007-03-22 22:29:00 UTC (rev 26278)
@@ -116,6 +116,13 @@
 	MAX_INT, MAX_INT, 0, 0
 };
 
+GfxMgr::GfxMgr(AgiEngine *vm) : _vm(vm) {
+	_shakeH = NULL;
+	_shakeV = NULL;
+	_agipalFileNum = 0;
+}
+
+
 /*
  *  Layer 4:  640x480?  ==================  User display
  *                              ^

Modified: scummvm/trunk/engines/agi/graphics.h
===================================================================
--- scummvm/trunk/engines/agi/graphics.h	2007-03-22 22:03:21 UTC (rev 26277)
+++ scummvm/trunk/engines/agi/graphics.h	2007-03-22 22:29:00 UTC (rev 26278)
@@ -50,12 +50,7 @@
 	int _agipalFileNum;
 
 public:
-	GfxMgr(AgiEngine *vm) {
-		_vm = vm;
-		_shakeH = NULL;
-		_shakeV = NULL;
-		_agipalFileNum = 0;
-	}
+	GfxMgr(AgiEngine *vm);
 
 	void gfxPutBlock(int x1, int y1, int x2, int y2);
 

Modified: scummvm/trunk/engines/agi/savegame.cpp
===================================================================
--- scummvm/trunk/engines/agi/savegame.cpp	2007-03-22 22:03:21 UTC (rev 26277)
+++ scummvm/trunk/engines/agi/savegame.cpp	2007-03-22 22:29:00 UTC (rev 26278)
@@ -202,8 +202,7 @@
 	out->writeByte(0);
 
 	//Write which file number AGIPAL is using (0 if not being used)
-	if ((getFeatures() & GF_AGIPAL))
-		out->writeSint16BE(_gfx->getAGIPalFileNum());
+	out->writeSint16BE(_gfx->getAGIPalFileNum());
 
 	out->finalize();
 	if (out->ioFailed())
@@ -440,7 +439,7 @@
 	}
 
 	//Load AGIPAL Data 
-	if ((getFeatures() & GF_AGIPAL) && (saveVersion >= 3))
+	if (saveVersion >= 3)
 		_gfx->setAGIPal(in->readSint16BE());
 
 	delete in;	


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