[Scummvm-cvs-logs] SF.net SVN: scummvm: [28775] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Fri Aug 31 20:34:47 CEST 2007
Revision: 28775
http://scummvm.svn.sourceforge.net/scummvm/?rev=28775&view=rev
Author: peres001
Date: 2007-08-31 11:34:46 -0700 (Fri, 31 Aug 2007)
Log Message:
-----------
Pushed current save/load code from Parallaction down to Parallaction_ns.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/saveload.cpp
scummvm/trunk/engines/parallaction/staticres.cpp
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2007-08-31 18:13:16 UTC (rev 28774)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2007-08-31 18:34:46 UTC (rev 28775)
@@ -39,10 +39,6 @@
#include "parallaction/disk.h"
#include "parallaction/walk.h"
-namespace GUI {
- class ListWidget;
- class CommandSender;
-}
extern OSystem *g_system;
@@ -368,8 +364,8 @@
int init();
- void loadGame();
- void saveGame();
+ virtual void loadGame() = 0;
+ virtual void saveGame() = 0;
uint16 updateInput();
@@ -537,11 +533,6 @@
InputData *translateInput();
void processInput(InputData*);
- int buildSaveFileList(Common::StringList& l);
- int selectSaveFile(uint16 arg_0, const char* caption, const char* button);
- void doLoadGame(uint16 slot);
- void doSaveGame(uint16 slot, const char* name);
-
void doLocationEnterTransition();
virtual void changeLocation(char *location) = 0;
virtual void changeCharacter(const char *name) = 0;
@@ -598,6 +589,10 @@
void renderLabel(Graphics::Surface *cnv, char *text);
void setMousePointer(int16 index);
+ void loadGame();
+ void saveGame();
+
+
private:
Menu* _menu;
@@ -608,6 +603,11 @@
void changeLocation(char *location);
void changeCharacter(const char *name);
+ void doLoadGame(uint16 slot);
+ void doSaveGame(uint16 slot, const char* name);
+ int buildSaveFileList(Common::StringList& l);
+ int selectSaveFile(uint16 arg_0, const char* caption, const char* button);
+
void initResources();
void initCursors();
Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp 2007-08-31 18:13:16 UTC (rev 28774)
+++ scummvm/trunk/engines/parallaction/saveload.cpp 2007-08-31 18:34:46 UTC (rev 28775)
@@ -47,9 +47,7 @@
namespace Parallaction {
-extern char _gameNames[][20];
-
class SaveLoadChooser : public GUI::Dialog {
typedef Common::String String;
typedef Common::StringList StringList;
@@ -61,12 +59,12 @@
GUI::StaticTextWidget *_time;
GUI::StaticTextWidget *_playtime;
GUI::ContainerWidget *_container;
- Parallaction *_vm;
+ Parallaction_ns *_vm;
uint8 _fillR, _fillG, _fillB;
public:
- SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine);
+ SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction_ns *engine);
~SaveLoadChooser();
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
@@ -80,7 +78,7 @@
-void Parallaction::doLoadGame(uint16 slot) {
+void Parallaction_ns::doLoadGame(uint16 slot) {
_introSarcData3 = 200;
_introSarcData2 = 1;
@@ -179,7 +177,7 @@
}
-void Parallaction::doSaveGame(uint16 slot, const char* name) {
+void Parallaction_ns::doSaveGame(uint16 slot, const char* name) {
char path[PATH_LEN];
sprintf(path, "game.%i", slot);
@@ -251,8 +249,7 @@
};
-
-SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction *engine)
+SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel, Parallaction_ns *engine)
: Dialog("scummsaveload"), _list(0), _chooseButton(0), _gfxWidget(0), _vm(engine) {
// _drawingHints |= GUI::THEME_HINT_SPECIAL_COLOR;
@@ -340,7 +337,7 @@
Dialog::reflowLayout();
}
-int Parallaction::buildSaveFileList(Common::StringList& l) {
+int Parallaction_ns::buildSaveFileList(Common::StringList& l) {
char name[16];
char buf[30];
@@ -367,7 +364,7 @@
}
-int Parallaction::selectSaveFile(uint16 arg_0, const char* caption, const char* button) {
+int Parallaction_ns::selectSaveFile(uint16 arg_0, const char* caption, const char* button) {
SaveLoadChooser* slc = new SaveLoadChooser(caption, button, this);
@@ -388,7 +385,7 @@
-void Parallaction::loadGame() {
+void Parallaction_ns::loadGame() {
int _di = selectSaveFile( 0, "Load file", "Load" );
if (_di == -1) {
@@ -406,7 +403,7 @@
}
-void Parallaction::saveGame() {
+void Parallaction_ns::saveGame() {
if (!scumm_stricmp(_location._name, "caveau"))
return;
Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp 2007-08-31 18:13:16 UTC (rev 28774)
+++ scummvm/trunk/engines/parallaction/staticres.cpp 2007-08-31 18:34:46 UTC (rev 28775)
@@ -249,19 +249,6 @@
"Command"
};
-const char _gameNames[10][20] = {
- "GAME1",
- "GAME2",
- "GAME3",
- "GAME4",
- "GAME5",
- "GAME6",
- "GAME7",
- "GAME8",
- "GAME9",
- "GAME10"
-};
-
const char *_commandsNamesRes_ns[] = {
"set",
"clear",
@@ -436,7 +423,8 @@
"div",
"if",
"endif",
- "stop"
+ "stop",
+ "endscript"
};
const char *_commandsNamesRes_br[] = {
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