aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/disk.h42
-rw-r--r--engines/parallaction/disk_br.cpp48
-rw-r--r--engines/parallaction/exec_ns.cpp2
-rw-r--r--engines/parallaction/graphics.cpp4
-rw-r--r--engines/parallaction/parallaction.cpp4
-rw-r--r--engines/parallaction/parallaction_br.cpp4
-rw-r--r--engines/parallaction/parallaction_ns.cpp2
7 files changed, 53 insertions, 53 deletions
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index 30d820c6d2..3fe8014f94 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -211,21 +211,21 @@ protected:
Parallaction *_vm;
- Common::FilesystemNode _baseDir;
- Common::FilesystemNode _partDir;
-
- Common::FilesystemNode _aniDir;
- Common::FilesystemNode _bkgDir;
- Common::FilesystemNode _mscDir;
- Common::FilesystemNode _mskDir;
- Common::FilesystemNode _pthDir;
- Common::FilesystemNode _rasDir;
- Common::FilesystemNode _scrDir;
- Common::FilesystemNode _sfxDir;
- Common::FilesystemNode _talDir;
+ Common::FSNode _baseDir;
+ Common::FSNode _partDir;
+
+ Common::FSNode _aniDir;
+ Common::FSNode _bkgDir;
+ Common::FSNode _mscDir;
+ Common::FSNode _mskDir;
+ Common::FSNode _pthDir;
+ Common::FSNode _rasDir;
+ Common::FSNode _scrDir;
+ Common::FSNode _sfxDir;
+ Common::FSNode _talDir;
protected:
- void errorFileNotFound(const Common::FilesystemNode &dir, const Common::String &filename);
+ void errorFileNotFound(const Common::FSNode &dir, const Common::String &filename);
Font *createFont(const char *name, Common::ReadStream &stream);
Sprites* createSprites(Common::ReadStream &stream);
void loadBitmap(Common::SeekableReadStream &stream, Graphics::Surface &surf, byte *palette);
@@ -273,14 +273,14 @@ protected:
Font *createFont(const char *name, Common::SeekableReadStream &stream);
void loadBackground(BackgroundInfo& info, Common::SeekableReadStream &stream);
- Common::FilesystemNode _baseBkgDir;
- Common::FilesystemNode _fntDir;
- Common::FilesystemNode _commonAniDir;
- Common::FilesystemNode _commonBkgDir;
- Common::FilesystemNode _commonMscDir;
- Common::FilesystemNode _commonMskDir;
- Common::FilesystemNode _commonPthDir;
- Common::FilesystemNode _commonTalDir;
+ Common::FSNode _baseBkgDir;
+ Common::FSNode _fntDir;
+ Common::FSNode _commonAniDir;
+ Common::FSNode _commonBkgDir;
+ Common::FSNode _commonMscDir;
+ Common::FSNode _commonMskDir;
+ Common::FSNode _commonPthDir;
+ Common::FSNode _commonTalDir;
public:
AmigaDisk_br(Parallaction *vm);
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 24893b7b05..0009b48a3a 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -91,7 +91,7 @@ struct Sprites : public Frames {
-void DosDisk_br::errorFileNotFound(const Common::FilesystemNode &dir, const Common::String &filename) {
+void DosDisk_br::errorFileNotFound(const Common::FSNode &dir, const Common::String &filename) {
error("File '%s' not found in directory '%s'", filename.c_str(), dir.getDisplayName().c_str());
}
@@ -134,7 +134,7 @@ GfxObj* DosDisk_br::loadTalk(const char *name) {
debugC(5, kDebugDisk, "DosDisk_br::loadTalk(%s)", name);
Common::String path(name);
- Common::FilesystemNode node = _talDir.getChild(path);
+ Common::FSNode node = _talDir.getChild(path);
if (!node.exists()) {
path += ".tal";
node = _talDir.getChild(path);
@@ -160,11 +160,11 @@ Script* DosDisk_br::loadLocation(const char *name) {
debugC(5, kDebugDisk, "DosDisk_br::loadLocation");
Common::String langs[4] = { "it", "fr", "en", "ge" };
- Common::FilesystemNode locDir = _partDir.getChild(langs[_language]);
+ Common::FSNode locDir = _partDir.getChild(langs[_language]);
Common::String path(name);
path += ".slf";
- Common::FilesystemNode node = locDir.getChild(path);
+ Common::FSNode node = locDir.getChild(path);
if (!node.exists()) {
path = Common::String(name) + ".loc";
node = locDir.getChild(path);
@@ -183,7 +183,7 @@ Script* DosDisk_br::loadScript(const char* name) {
Common::String path(name);
path += ".scr";
- Common::FilesystemNode node = _scrDir.getChild(path);
+ Common::FSNode node = _scrDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_scrDir, path);
}
@@ -221,7 +221,7 @@ Frames* DosDisk_br::loadPointer(const char *name) {
Common::String path(name);
path += ".ras";
- Common::FilesystemNode node = _baseDir.getChild(path);
+ Common::FSNode node = _baseDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_baseDir, path);
}
@@ -240,7 +240,7 @@ Font* DosDisk_br::loadFont(const char* name) {
Common::String path(name);
path += ".fnt";
- Common::FilesystemNode node = _baseDir.getChild(path);
+ Common::FSNode node = _baseDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_baseDir, path);
}
@@ -255,7 +255,7 @@ GfxObj* DosDisk_br::loadObjects(const char *name) {
debugC(5, kDebugDisk, "DosDisk_br::loadObjects");
Common::String path(name);
- Common::FilesystemNode node = _partDir.getChild(path);
+ Common::FSNode node = _partDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_partDir, path);
}
@@ -274,7 +274,7 @@ GfxObj* DosDisk_br::loadStatic(const char* name) {
debugC(5, kDebugDisk, "DosDisk_br::loadStatic");
Common::String path(name);
- Common::FilesystemNode node = _rasDir.getChild(path);
+ Common::FSNode node = _rasDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_rasDir, path);
}
@@ -312,7 +312,7 @@ Frames* DosDisk_br::loadFrames(const char* name) {
debugC(5, kDebugDisk, "DosDisk_br::loadFrames");
Common::String path(name);
- Common::FilesystemNode node = _aniDir.getChild(path);
+ Common::FSNode node = _aniDir.getChild(path);
if (!node.exists()) {
path += ".ani";
node = _aniDir.getChild(path);
@@ -336,7 +336,7 @@ void DosDisk_br::loadSlide(BackgroundInfo& info, const char *name) {
Common::String path(name);
path += ".bmp";
- Common::FilesystemNode node = _baseDir.getChild(path);
+ Common::FSNode node = _baseDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_baseDir, path);
}
@@ -363,7 +363,7 @@ void DosDisk_br::loadMask(const char *name, MaskBuffer &buffer) {
}
Common::String filepath;
- Common::FilesystemNode node;
+ Common::FSNode node;
Common::File stream;
filepath = Common::String(name) + ".msk";
@@ -384,7 +384,7 @@ void DosDisk_br::loadScenery(BackgroundInfo& info, const char *name, const char
debugC(5, kDebugDisk, "DosDisk_br::loadScenery");
Common::String filepath;
- Common::FilesystemNode node;
+ Common::FSNode node;
Common::File stream;
if (name) {
@@ -447,7 +447,7 @@ Table* DosDisk_br::loadTable(const char* name) {
Common::String path(name);
path += ".tab";
- Common::FilesystemNode node = _partDir.getChild(path);
+ Common::FSNode node = _partDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_partDir, path);
}
@@ -518,7 +518,7 @@ AmigaDisk_br::AmigaDisk_br(Parallaction *vm) : DosDisk_br(vm) {
_baseBkgDir = _baseDir.getChild("backs");
- Common::FilesystemNode commonDir = _baseDir.getChild("common");
+ Common::FSNode commonDir = _baseDir.getChild("common");
_commonAniDir = commonDir.getChild("anims");
_commonBkgDir = commonDir.getChild("backs");
_commonMscDir = commonDir.getChild("msc");
@@ -566,7 +566,7 @@ void AmigaDisk_br::loadScenery(BackgroundInfo& info, const char* name, const cha
debugC(1, kDebugDisk, "AmigaDisk_br::loadScenery '%s', '%s' '%s'", name, mask, path);
Common::String filepath;
- Common::FilesystemNode node;
+ Common::FSNode node;
Common::File stream;
if (name) {
@@ -630,7 +630,7 @@ void AmigaDisk_br::loadSlide(BackgroundInfo& info, const char *name) {
Common::String path(name);
path += ".bkg";
- Common::FilesystemNode node = _baseBkgDir.getChild(path);
+ Common::FSNode node = _baseBkgDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_baseBkgDir, path);
}
@@ -644,7 +644,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) {
debugC(1, kDebugDisk, "AmigaDisk_br::loadStatic '%s'", name);
Common::String path(name);
- Common::FilesystemNode node = _rasDir.getChild(path);
+ Common::FSNode node = _rasDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_rasDir, path);
}
@@ -687,7 +687,7 @@ Frames* AmigaDisk_br::loadFrames(const char* name) {
debugC(1, kDebugDisk, "AmigaDisk_br::loadFrames '%s'", name);
Common::String path(name);
- Common::FilesystemNode node = _aniDir.getChild(path);
+ Common::FSNode node = _aniDir.getChild(path);
if (!node.exists()) {
path += ".ani";
node = _aniDir.getChild(path);
@@ -713,7 +713,7 @@ GfxObj* AmigaDisk_br::loadTalk(const char *name) {
debugC(1, kDebugDisk, "AmigaDisk_br::loadTalk '%s'", name);
Common::String path(name);
- Common::FilesystemNode node = _talDir.getChild(path);
+ Common::FSNode node = _talDir.getChild(path);
if (!node.exists()) {
path += ".tal";
node = _talDir.getChild(path);
@@ -740,7 +740,7 @@ Font* AmigaDisk_br::loadFont(const char* name) {
Common::String path(name);
path += ".font";
- Common::FilesystemNode node = _fntDir.getChild(path);
+ Common::FSNode node = _fntDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_fntDir, path);
}
@@ -773,7 +773,7 @@ Common::SeekableReadStream* AmigaDisk_br::loadMusic(const char* name) {
debugC(5, kDebugDisk, "AmigaDisk_br::loadMusic");
Common::String path(name);
- Common::FilesystemNode node = _mscDir.getChild(path);
+ Common::FSNode node = _mscDir.getChild(path);
if (!node.exists()) {
// TODO (Kirben): error out when music file is not found?
return 0;
@@ -789,7 +789,7 @@ Common::ReadStream* AmigaDisk_br::loadSound(const char* name) {
debugC(5, kDebugDisk, "AmigaDisk_br::loadSound");
Common::String path(name);
- Common::FilesystemNode node = _sfxDir.getChild(path);
+ Common::FSNode node = _sfxDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_sfxDir, path);
}
@@ -803,7 +803,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name) {
debugC(5, kDebugDisk, "AmigaDisk_br::loadObjects");
Common::String path(name);
- Common::FilesystemNode node = _partDir.getChild(path);
+ Common::FSNode node = _partDir.getChild(path);
if (!node.exists()) {
errorFileNotFound(_partDir, path);
}
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 2ce50f498e..9cbb5c33b4 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -357,7 +357,7 @@ void CommandExec::runList(CommandList::iterator first, CommandList::iterator las
_ctxt.suspend = false;
for ( ; first != last; first++) {
- if (_vm->quit())
+ if (_vm->shouldQuit())
break;
CommandPtr cmd = *first;
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 2bd3935f01..5526ecc64d 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -750,8 +750,8 @@ Gfx::Gfx(Parallaction* vm) :
_vm(vm), _disk(vm->_disk) {
_vm->_system->beginGFXTransaction();
- _vm->_system->initSize(_vm->_screenWidth, _vm->_screenHeight);
- _vm->initCommonGFX(_vm->getGameType() == GType_BRA);
+ _vm->_system->initSize(_vm->_screenWidth, _vm->_screenHeight);
+ initCommonGFX(_vm->getGameType() == GType_BRA);
_vm->_system->endGFXTransaction();
setPalette(_palette);
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 828cb4d021..b52c4cfba8 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -326,7 +326,7 @@ void Parallaction::processInput(int event) {
void Parallaction::runGame() {
int event = _input->updateInput();
- if (quit())
+ if (shouldQuit())
return;
runGuiFrame();
@@ -337,7 +337,7 @@ void Parallaction::runGame() {
processInput(event);
runPendingZones();
- if (quit())
+ if (shouldQuit())
return;
if (_engineFlags & kEngineChangeLocation) {
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp
index a06fba43f9..8929efdcbc 100644
--- a/engines/parallaction/parallaction_br.cpp
+++ b/engines/parallaction/parallaction_br.cpp
@@ -104,7 +104,7 @@ int Parallaction_br::go() {
bool splash = true;
- while (!quit()) {
+ while (!shouldQuit()) {
if (getFeatures() & GF_DEMO) {
scheduleLocationSwitch("camalb.1");
@@ -117,7 +117,7 @@ int Parallaction_br::go() {
// initCharacter();
- while (((_engineFlags & kEngineReturn) == 0) && (!quit())) {
+ while (((_engineFlags & kEngineReturn) == 0) && (!shouldQuit())) {
runGame();
}
_engineFlags &= ~kEngineReturn;
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 8e11931c28..f4a1ef03ec 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -231,7 +231,7 @@ int Parallaction_ns::go() {
startGui();
- while (!quit()) {
+ while (!shouldQuit()) {
runGame();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-20 05:27:26 +0000