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

[dsx at users.sourceforge.net]

Revision: 25103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25103&view=rev
Author:   dsx
Date:     2007-01-16 05:09:42 -0800 (Tue, 16 Jan 2007)

Log Message:
-----------
Remove #include "agi/text.h"; fixes build. Pointyhat to aquadran.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/console.cpp
    scummvm/trunk/engines/agi/cycle.cpp
    scummvm/trunk/engines/agi/inv.cpp
    scummvm/trunk/engines/agi/keyboard.cpp
    scummvm/trunk/engines/agi/menu.cpp
    scummvm/trunk/engines/agi/op_cmd.cpp
    scummvm/trunk/engines/agi/predictive.cpp
    scummvm/trunk/engines/agi/savegame.cpp
    scummvm/trunk/engines/agi/sprite.cpp
    scummvm/trunk/engines/agi/text.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/agi.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -38,7 +38,6 @@
 #include "sound/mixer.h"
 
 #include "agi/agi.h"
-#include "agi/text.h"
 #include "agi/graphics.h"
 #include "agi/sprite.h"
 #include "agi/opcodes.h"
@@ -263,7 +262,7 @@
 		free(_imageStack);
 	_imageStack = NULL;
 	_stackSize = 0;
-	_imageStackPointer = NULL;
+	_imageStackPointer = 0;
 }
 
 void AgiEngine::recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,

Modified: scummvm/trunk/engines/agi/console.cpp
===================================================================
--- scummvm/trunk/engines/agi/console.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/console.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -27,7 +27,6 @@
 #include "agi/agi.h"
 #include "agi/graphics.h"
 #include "agi/sprite.h"
-#include "agi/text.h"
 #include "agi/keyboard.h"
 #include "agi/opcodes.h"
 #include "agi/console.h"

Modified: scummvm/trunk/engines/agi/cycle.cpp
===================================================================
--- scummvm/trunk/engines/agi/cycle.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/cycle.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -25,7 +25,6 @@
 #include "common/stdafx.h"
 
 #include "agi/agi.h"
-#include "agi/text.h"
 #include "agi/sprite.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"

Modified: scummvm/trunk/engines/agi/inv.cpp
===================================================================
--- scummvm/trunk/engines/agi/inv.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/inv.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -28,8 +28,6 @@
 #include "agi/sprite.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
-#include "agi/text.h"
-#include "agi/keyboard.h"
 
 namespace Agi {
 

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -28,7 +28,6 @@
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 #include "agi/menu.h"
-#include "agi/text.h"		/* remove later */
 
 namespace Agi {
 

Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/menu.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -29,7 +29,6 @@
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
 #include "agi/menu.h"
-#include "agi/text.h"
 #include "common/list.h"
 
 namespace Agi {

Modified: scummvm/trunk/engines/agi/op_cmd.cpp
===================================================================
--- scummvm/trunk/engines/agi/op_cmd.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/op_cmd.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -31,7 +31,6 @@
 #include "agi/keyboard.h"
 #include "agi/opcodes.h"
 #include "agi/menu.h"
-#include "agi/text.h"
 
 namespace Agi {
 

Modified: scummvm/trunk/engines/agi/predictive.cpp
===================================================================
--- scummvm/trunk/engines/agi/predictive.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/predictive.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -23,7 +23,6 @@
 #include "agi/agi.h"
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
-#include "agi/text.h"
 
 #include "common/func.h"
 

Modified: scummvm/trunk/engines/agi/savegame.cpp
===================================================================
--- scummvm/trunk/engines/agi/savegame.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/savegame.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -33,7 +33,6 @@
 #include "agi/agi.h"
 #include "agi/graphics.h"
 #include "agi/sprite.h"
-#include "agi/text.h"
 #include "agi/keyboard.h"
 #include "agi/menu.h"
 

Modified: scummvm/trunk/engines/agi/sprite.cpp
===================================================================
--- scummvm/trunk/engines/agi/sprite.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/sprite.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -25,7 +25,6 @@
 #include "agi/agi.h"
 #include "agi/sprite.h"
 #include "agi/graphics.h"
-#include "agi/text.h"
 
 namespace Agi {
 

Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp	2007-01-16 12:43:13 UTC (rev 25102)
+++ scummvm/trunk/engines/agi/text.cpp	2007-01-16 13:09:42 UTC (rev 25103)
@@ -26,7 +26,6 @@
 #include "agi/sprite.h"		/* for commit_both() */
 #include "agi/graphics.h"
 #include "agi/keyboard.h"
-#include "agi/text.h"
 
 namespace Agi {
 


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