[Scummvm-cvs-logs] SF.net SVN: scummvm: [27954] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sat Jul 7 21:42:06 CEST 2007


Revision: 27954
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27954&view=rev
Author:   peres001
Date:     2007-07-07 12:42:06 -0700 (Sat, 07 Jul 2007)

Log Message:
-----------
Moved SaveLoadChooser class to saveload.cpp and adjusted dependencies.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/defs.h
    scummvm/trunk/engines/parallaction/disk.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/saveload.cpp

Modified: scummvm/trunk/engines/parallaction/defs.h
===================================================================
--- scummvm/trunk/engines/parallaction/defs.h	2007-07-07 19:34:09 UTC (rev 27953)
+++ scummvm/trunk/engines/parallaction/defs.h	2007-07-07 19:42:06 UTC (rev 27954)
@@ -28,6 +28,7 @@
 
 #include "common/stdafx.h"
 #include "common/list.h"
+#include "common/rect.h"
 
 namespace Parallaction {
 

Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp	2007-07-07 19:34:09 UTC (rev 27953)
+++ scummvm/trunk/engines/parallaction/disk.cpp	2007-07-07 19:42:06 UTC (rev 27954)
@@ -26,6 +26,8 @@
 #include "common/stdafx.h"
 
 #include "graphics/iff.h"
+#include "graphics/surface.h"
+
 #include "parallaction/parallaction.h"
 
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-07-07 19:34:09 UTC (rev 27953)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-07-07 19:42:06 UTC (rev 27954)
@@ -27,9 +27,8 @@
 #define PARALLACTION_H
 
 #include "common/str.h"
-#include "gui/dialog.h"
-#include "gui/widget.h"
 
+
 #include "engines/engine.h"
 
 #include "parallaction/defs.h"
@@ -471,34 +470,7 @@
 // FIXME: remove global
 extern Parallaction *_vm;
 
-class SaveLoadChooser : public GUI::Dialog {
-	typedef Common::String String;
-	typedef Common::StringList StringList;
-protected:
-	GUI::ListWidget		*_list;
-	GUI::ButtonWidget	*_chooseButton;
-	GUI::GraphicsWidget	*_gfxWidget;
-	GUI::StaticTextWidget	*_date;
-	GUI::StaticTextWidget	*_time;
-	GUI::StaticTextWidget	*_playtime;
-	GUI::ContainerWidget	*_container;
-	Parallaction			*_vm;
 
-	uint8 _fillR, _fillG, _fillB;
-
-public:
-	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
-	~SaveLoadChooser();
-
-	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
-	const String &getResultString() const;
-	void setList(const StringList& list);
-	int runModal();
-
-	virtual void reflowLayout();
-};
-
-
 } // namespace Parallaction
 
 

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2007-07-07 19:34:09 UTC (rev 27953)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2007-07-07 19:42:06 UTC (rev 27954)
@@ -26,6 +26,7 @@
 #include "common/stdafx.h"
 #include "common/savefile.h"
 
+#include "gui/dialog.h"
 #include "gui/widget.h"
 #include "gui/ListWidget.h"
 #include "gui/message.h"
@@ -48,6 +49,37 @@
 
 extern char _gameNames[][20];
 
+
+class SaveLoadChooser : public GUI::Dialog {
+	typedef Common::String String;
+	typedef Common::StringList StringList;
+protected:
+	GUI::ListWidget		*_list;
+	GUI::ButtonWidget	*_chooseButton;
+	GUI::GraphicsWidget	*_gfxWidget;
+	GUI::StaticTextWidget	*_date;
+	GUI::StaticTextWidget	*_time;
+	GUI::StaticTextWidget	*_playtime;
+	GUI::ContainerWidget	*_container;
+	Parallaction			*_vm;
+
+	uint8 _fillR, _fillG, _fillB;
+
+public:
+	SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
+	~SaveLoadChooser();
+
+	virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
+	const String &getResultString() const;
+	void setList(const StringList& list);
+	int runModal();
+
+	virtual void reflowLayout();
+};
+
+
+
+
 void Parallaction::doLoadGame(uint16 slot) {
 
 	_introSarcData3 = 200;


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