aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/queen/bankman.h4
-rw-r--r--engines/queen/command.cpp11
-rw-r--r--engines/queen/command.h6
-rw-r--r--engines/queen/credits.h4
-rw-r--r--engines/queen/cutaway.h4
-rw-r--r--engines/queen/debug.h4
-rw-r--r--engines/queen/defs.h4
-rw-r--r--engines/queen/display.h6
-rw-r--r--engines/queen/graphics.h4
-rw-r--r--engines/queen/grid.h4
-rw-r--r--engines/queen/input.h4
-rw-r--r--engines/queen/journal.h4
-rw-r--r--engines/queen/logic.cpp6
-rw-r--r--engines/queen/logic.h6
-rw-r--r--engines/queen/music.h4
-rw-r--r--engines/queen/queen.cpp2
-rw-r--r--engines/queen/resource.h12
-rw-r--r--engines/queen/sound.h4
-rw-r--r--engines/queen/state.h4
-rw-r--r--engines/queen/structs.h4
-rw-r--r--engines/queen/walk.h4
21 files changed, 53 insertions, 52 deletions
diff --git a/engines/queen/bankman.h b/engines/queen/bankman.h
index 63eb9224ff..a386706950 100644
--- a/engines/queen/bankman.h
+++ b/engines/queen/bankman.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENBANKMAN_H
-#define QUEENBANKMAN_H
+#ifndef QUEEN_BANKMAN_H
+#define QUEEN_BANKMAN_H
#include "common/util.h"
#include "queen/structs.h"
diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 5767223301..8366eb2b72 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -36,8 +36,9 @@
namespace Queen {
-CmdText::CmdText(bool reversed, uint8 y, QueenEngine *vm)
- : _isReversed(reversed), _y(y), _vm(vm) {
+CmdText::CmdText(uint8 y, QueenEngine *vm)
+ : _y(y), _vm(vm) {
+ _isReversed = (_vm->resource()->getLanguage() == Common::HB_ISR);
clear();
}
@@ -124,7 +125,7 @@ void CmdState::init() {
Command::Command(QueenEngine *vm)
: _cmdList(NULL), _cmdArea(NULL), _cmdObject(NULL), _cmdInventory(NULL), _cmdGameState(NULL),
- _cmdText((vm->resource()->getLanguage() == Common::HB_ISR), CmdText::COMMAND_Y_POS, vm), _vm(vm) {
+ _cmdText(CmdText::COMMAND_Y_POS, vm), _vm(vm) {
}
Command::~Command() {
@@ -214,7 +215,7 @@ void Command::executeCurrentAction() {
// Joe is stuck behind the waterfall due to a walkbox issue. We could
// fix the walkbox issue, but then Joe would walk through the waterfall
// which wouldn't look that nice, graphically.
- //
+ //
// Since this command isn't necessary to complete the game and doesn't
// really makes sense here, we just skip it for now. The same cutscene
// is already played in command 648, so the user don't miss anything
@@ -225,7 +226,7 @@ void Command::executeCurrentAction() {
if (comId == 649) {
continue;
}
-
+
com = &_cmdList[comId];
// check the Gamestates and set them if necessary
diff --git a/engines/queen/command.h b/engines/queen/command.h
index 3ef848b24d..daec799b90 100644
--- a/engines/queen/command.h
+++ b/engines/queen/command.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENCOMMAND_H
-#define QUEENCOMMAND_H
+#ifndef QUEEN_COMMAND_H
+#define QUEEN_COMMAND_H
#include "common/util.h"
#include "queen/structs.h"
@@ -32,7 +32,7 @@ class QueenEngine;
struct CmdText {
- CmdText(bool reversed, uint8 y, QueenEngine *vm);
+ CmdText(uint8 y, QueenEngine *vm);
//! reset the command sentence
void clear();
diff --git a/engines/queen/credits.h b/engines/queen/credits.h
index 4f34772c28..2882a31bcf 100644
--- a/engines/queen/credits.h
+++ b/engines/queen/credits.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef CREDITS_H
-#define CREDITS_H
+#ifndef QUEEN_CREDITS_H
+#define QUEEN_CREDITS_H
#include "common/util.h"
#include "queen/defs.h"
diff --git a/engines/queen/cutaway.h b/engines/queen/cutaway.h
index bbf5ec0652..bbec1406ad 100644
--- a/engines/queen/cutaway.h
+++ b/engines/queen/cutaway.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENCUTAWAY_H
-#define QUEENCUTAWAY_H
+#ifndef QUEEN_CUTAWAY_H
+#define QUEEN_CUTAWAY_H
#include "common/util.h"
#include "queen/structs.h"
diff --git a/engines/queen/debug.h b/engines/queen/debug.h
index 0959686a45..688486af88 100644
--- a/engines/queen/debug.h
+++ b/engines/queen/debug.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENDEBUG_H
-#define QUEENDEBUG_H
+#ifndef QUEEN_DEBUG_H
+#define QUEEN_DEBUG_H
#include "gui/debugger.h"
diff --git a/engines/queen/defs.h b/engines/queen/defs.h
index f3b98e3fe2..4c465eae4f 100644
--- a/engines/queen/defs.h
+++ b/engines/queen/defs.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENDEFS_H
-#define QUEENDEFS_H
+#ifndef QUEEN_DEFS_H
+#define QUEEN_DEFS_H
namespace Queen {
diff --git a/engines/queen/display.h b/engines/queen/display.h
index 8f81f11791..953d8f95e8 100644
--- a/engines/queen/display.h
+++ b/engines/queen/display.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENDISPLAY_H
-#define QUEENDISPLAY_H
+#ifndef QUEEN_DISPLAY_H
+#define QUEEN_DISPLAY_H
#include "common/str.h"
#include "common/util.h"
@@ -151,7 +151,7 @@ public:
//! change the text color for the specified texts list entry
void textColor(uint16 y, uint8 color) { _texts[y].color = color; }
-
+
//! Set the focus rectangle to the speaking character
void setFocusRect(const Common::Rect& rect);
diff --git a/engines/queen/graphics.h b/engines/queen/graphics.h
index b2899a5036..0a0a7d3635 100644
--- a/engines/queen/graphics.h
+++ b/engines/queen/graphics.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENGRAPHICS_H
-#define QUEENGRAPHICS_H
+#ifndef QUEEN_GRAPHICS_H
+#define QUEEN_GRAPHICS_H
#include "common/util.h"
#include "queen/structs.h"
diff --git a/engines/queen/grid.h b/engines/queen/grid.h
index d6e148eec2..3e5ea02f0a 100644
--- a/engines/queen/grid.h
+++ b/engines/queen/grid.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENGRID_H
-#define QUEENGRID_H
+#ifndef QUEEN_GRID_H
+#define QUEEN_GRID_H
#include "common/util.h"
#include "queen/structs.h"
diff --git a/engines/queen/input.h b/engines/queen/input.h
index 3a36fe64ee..c83cc5da34 100644
--- a/engines/queen/input.h
+++ b/engines/queen/input.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef INPUT_H
-#define INPUT_H
+#ifndef QUEEN_INPUT_H
+#define QUEEN_INPUT_H
#include "common/util.h"
#include "queen/defs.h"
diff --git a/engines/queen/journal.h b/engines/queen/journal.h
index ab3e2a0ecd..23110d8879 100644
--- a/engines/queen/journal.h
+++ b/engines/queen/journal.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENJOURNAL_H
-#define QUEENJOURNAL_H
+#ifndef QUEEN_JOURNAL_H
+#define QUEEN_JOURNAL_H
#include "common/util.h"
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index 91960fd8df..150afb5a6b 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -70,7 +70,7 @@ Logic::Logic(QueenEngine *vm)
_puzzleAttemptCount = 0;
_journal = new Journal(vm);
_scene = 0;
- initialise();
+ readQueenJas();
}
Logic::~Logic() {
@@ -88,7 +88,7 @@ Logic::~Logic() {
delete[] _graphicAnim;
}
-void Logic::initialise() {
+void Logic::readQueenJas() {
int16 i;
uint8 *jas = _vm->resource()->loadFile("QUEEN.JAS", 20);
@@ -1232,7 +1232,7 @@ void Logic::handlePinnacleRoom() {
_entryObj = 0;
uint16 prevObj = 0;
- CmdText cmdText((_vm->resource()->getLanguage() == Common::HB_ISR), 5, _vm);
+ CmdText cmdText(5, _vm);
cmdText.setVerb(VERB_WALK_TO);
while (_vm->input()->mouseButton() == 0 || _entryObj == 0) {
diff --git a/engines/queen/logic.h b/engines/queen/logic.h
index f1f93de17e..2721951f4e 100644
--- a/engines/queen/logic.h
+++ b/engines/queen/logic.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENLOGIC_H
-#define QUEENLOGIC_H
+#ifndef QUEEN_LOGIC_H
+#define QUEEN_LOGIC_H
#include "common/str.h"
#include "common/util.h"
@@ -224,7 +224,7 @@ public:
protected:
- void initialise();
+ void readQueenJas();
void asmMakeJoeUseDress();
void asmMakeJoeUseNormalClothes();
diff --git a/engines/queen/music.h b/engines/queen/music.h
index 1051b8b988..1112b1fe6c 100644
--- a/engines/queen/music.h
+++ b/engines/queen/music.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENMUSIC_H
-#define QUEENMUSIC_H
+#ifndef QUEEN_MUSIC_H
+#define QUEEN_MUSIC_H
#include "common/util.h"
#include "sound/mididrv.h"
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 5bada63983..72ae09cffe 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -80,7 +80,7 @@ DetectedGameList Engine_QUEEN_detectGames(const FSList &fslist) {
}
Queen::DetectedGameVersion version;
if (Queen::Resource::detectVersion(&version, &dataFile)) {
- DetectedGame dg(queenGameDescriptor.gameid, queenGameDescriptor.description, version.language, Common::kPlatformPC);
+ DetectedGame dg(queenGameDescriptor, version.language, Common::kPlatformPC);
if (version.features & Queen::GF_DEMO) {
dg.updateDesc("Demo");
} else if (version.features & Queen::GF_INTERVIEW) {
diff --git a/engines/queen/resource.h b/engines/queen/resource.h
index d01dc83859..de97dc02c3 100644
--- a/engines/queen/resource.h
+++ b/engines/queen/resource.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENRESOURCE_H
-#define QUEENRESOURCE_H
+#ifndef QUEEN_RESOURCE_H
+#define QUEEN_RESOURCE_H
#include "common/file.h"
#include "common/util.h"
@@ -73,10 +73,10 @@ public:
//! returns a reference to a sound file
Common::File *giveCompressedSound(const char *filename, uint32 *size);
- bool isDemo() const { return _version.features & GF_DEMO; }
- bool isInterview() const { return _version.features & GF_INTERVIEW; }
- bool isFloppy() const { return _version.features & GF_FLOPPY; }
- bool isCD() const { return _version.features & GF_TALKIE; }
+ bool isDemo() const { return (_version.features & GF_DEMO) != 0; }
+ bool isInterview() const { return (_version.features & GF_INTERVIEW) != 0; }
+ bool isFloppy() const { return (_version.features & GF_FLOPPY) != 0; }
+ bool isCD() const { return (_version.features & GF_TALKIE) != 0; }
//! returns compression type for audio files
uint8 getCompression() const { return _version.compression; }
diff --git a/engines/queen/sound.h b/engines/queen/sound.h
index d12032e994..ea6c9f1bb2 100644
--- a/engines/queen/sound.h
+++ b/engines/queen/sound.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENSOUND_H
-#define QUEENSOUND_H
+#ifndef QUEEN_SOUND_H
+#define QUEEN_SOUND_H
#include "common/util.h"
#include "sound/mixer.h"
diff --git a/engines/queen/state.h b/engines/queen/state.h
index d7be47fbc8..0cb1fd5e3b 100644
--- a/engines/queen/state.h
+++ b/engines/queen/state.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENSTATE_H
-#define QUEENSTATE_H
+#ifndef QUEEN_STATE_H
+#define QUEEN_STATE_H
#include "common/util.h"
#include "queen/defs.h"
diff --git a/engines/queen/structs.h b/engines/queen/structs.h
index 65d373295a..0bcd802037 100644
--- a/engines/queen/structs.h
+++ b/engines/queen/structs.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENSTRUCTS_H
-#define QUEENSTRUCTS_H
+#ifndef QUEEN_STRUCTS_H
+#define QUEEN_STRUCTS_H
#include "queen/defs.h"
#include "common/endian.h"
diff --git a/engines/queen/walk.h b/engines/queen/walk.h
index 02c8264db9..531bd84e8a 100644
--- a/engines/queen/walk.h
+++ b/engines/queen/walk.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef QUEENWALK_H
-#define QUEENWALK_H
+#ifndef QUEEN_WALK_H
+#define QUEEN_WALK_H
#include "common/util.h"
#include "queen/structs.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 02:23:59 +0000