aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/defs.h4
-rw-r--r--engines/parallaction/detection.cpp36
-rw-r--r--engines/parallaction/dialogue.cpp6
-rw-r--r--engines/parallaction/disk.h14
-rw-r--r--engines/parallaction/exec_ns.cpp6
-rw-r--r--engines/parallaction/font.cpp2
-rw-r--r--engines/parallaction/graphics.cpp2
-rw-r--r--engines/parallaction/graphics.h8
-rw-r--r--engines/parallaction/gui_ns.cpp6
-rw-r--r--engines/parallaction/inventory.cpp6
-rw-r--r--engines/parallaction/inventory.h6
-rw-r--r--engines/parallaction/objects.h58
-rw-r--r--engines/parallaction/parallaction.cpp2
-rw-r--r--engines/parallaction/parallaction.h170
-rw-r--r--engines/parallaction/parser_br.cpp8
-rw-r--r--engines/parallaction/parser_ns.cpp16
-rw-r--r--engines/parallaction/sound.h6
-rw-r--r--engines/parallaction/walk.cpp2
-rw-r--r--engines/parallaction/walk.h8
19 files changed, 183 insertions, 183 deletions
diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h
index f2baab134d..2f78ec6133 100644
--- a/engines/parallaction/defs.h
+++ b/engines/parallaction/defs.h
@@ -38,8 +38,8 @@ class ManagedList : public Common::List<T> {
public:
- typedef typename Common::List<T> Common_List;
- typedef typename Common::List<T>::iterator iterator;
+ typedef typename Common::List<T> Common_List;
+ typedef typename Common::List<T>::iterator iterator;
typedef int (*CompareFunction) (const T& a, const T& b);
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index b2bf878cbe..68859112dd 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -64,10 +64,10 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{ "disk2", 0, "bfdd7bcfbc226f4acf3f67fa9efa2826", 907205},
{ "disk3", 0, "eec08180240888d76e3cfe3e183d5d5d", 1030721},
{ "disk4", 0, "5bffddc7db226bdaa7dd3e10e5a15e68", 1151403},
- { "en", 0, "65cbfa81eafe308621184796ed116700", 399360},
- { "fr", 0, "ac20c743ea10f2cb4491f76c5644582c", 410624},
- { "ge", 0, "50916bfa34aee1380e0e959b37eceb5a", 410624},
- { "it", 0, "89964aef04d2c53a615ee8983caf2775", 410624},
+ { "en", 0, "65cbfa81eafe308621184796ed116700", 399360},
+ { "fr", 0, "ac20c743ea10f2cb4491f76c5644582c", 410624},
+ { "ge", 0, "50916bfa34aee1380e0e959b37eceb5a", 410624},
+ { "it", 0, "89964aef04d2c53a615ee8983caf2775", 410624},
{ NULL, 0, NULL, 0}
},
Common::UNK_LANG,
@@ -83,14 +83,14 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
"nippon",
"Multi-lingual",
{
- { "disk0", 0, "16cca8724fdf4ec8234385497a0c728a", 208437},
- { "disk1", 0, "6b29987cfe2298d3745b6d99a0080c44", 901120},
- { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120},
- { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120},
- { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120},
- { "en", 0, "c9ec4f2267d736eef4877c5133e1c6e1", 174074},
- { "ge", 0, "42d6f10a4ebdadb25a6161d53ea4f450", 182298},
- { "fr", 0, "cf17defc24f143d1a9acb52eaa5c2406", 179958},
+ { "disk0", 0, "16cca8724fdf4ec8234385497a0c728a", 208437},
+ { "disk1", 0, "6b29987cfe2298d3745b6d99a0080c44", 901120},
+ { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120},
+ { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120},
+ { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120},
+ { "en", 0, "c9ec4f2267d736eef4877c5133e1c6e1", 174074},
+ { "ge", 0, "42d6f10a4ebdadb25a6161d53ea4f450", 182298},
+ { "fr", 0, "cf17defc24f143d1a9acb52eaa5c2406", 179958},
{ NULL, 0, NULL, 0}
},
Common::UNK_LANG,
@@ -107,7 +107,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
"Demo",
{
{ "disk0", 0, "6fed2e18a6bfe5e8bb49144fcc95fd11", 624640},
- { "fr", 0, "72f04be4320dfac719431419ec2b9a0d", 12778},
+ { "fr", 0, "72f04be4320dfac719431419ec2b9a0d", 12778},
{ NULL, 0, NULL, 0}
},
Common::EN_ANY,
@@ -124,11 +124,11 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
"nippon",
"",
{
- { "disk0", 0, "bfee75d8015f1fb97e75dbe08df4bef7", 354304},
- { "disk1", 0, "f339dd108c1a1f5cd4853d9966e5d01f", 901120},
- { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120},
- { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120},
- { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120},
+ { "disk0", 0, "bfee75d8015f1fb97e75dbe08df4bef7", 354304},
+ { "disk1", 0, "f339dd108c1a1f5cd4853d9966e5d01f", 901120},
+ { "disk2", 0, "2db40bf8198a57d18e4471a6deaab970", 901120},
+ { "disk3", 0, "0486972962b2bfc230e789b9f88f9ec8", 901120},
+ { "disk4", 0, "6f625e7f05da4a2f57d6b62d57013614", 901120},
{ "it", 0, "746088eb8de2b2713685d243a4e4678f", 185344},
{ NULL, 0, NULL, 0}
},
diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 6d756f172f..73414ce0b4 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -30,7 +30,7 @@
namespace Parallaction {
-#define MAX_PASSWORD_LENGTH 7
+#define MAX_PASSWORD_LENGTH 7
#define QUESTION_BALLOON_X 140
#define QUESTION_BALLOON_Y 10
@@ -46,9 +46,9 @@ class DialogueManager {
SpeakData *_data;
Dialogue *_dialogue;
- bool _askPassword;
+ bool _askPassword;
- bool isNpc;
+ bool isNpc;
Frames *_questioner;
Frames *_answerer;
diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h
index f6bb87d247..b79c8125b9 100644
--- a/engines/parallaction/disk.h
+++ b/engines/parallaction/disk.h
@@ -71,20 +71,20 @@ public:
-#define MAX_ARCHIVE_ENTRIES 384
+#define MAX_ARCHIVE_ENTRIES 384
class Archive : public Common::SeekableReadStream {
protected:
- bool _file;
+ bool _file;
uint32 _fileOffset;
uint32 _fileCursor;
uint32 _fileEndOffset;
Common::String _archiveName;
- char _archiveDir[MAX_ARCHIVE_ENTRIES][32];
+ char _archiveDir[MAX_ARCHIVE_ENTRIES][32];
uint32 _archiveLenghts[MAX_ARCHIVE_ENTRIES];
uint32 _archiveOffsets[MAX_ARCHIVE_ENTRIES];
- Common::File _archive;
+ Common::File _archive;
uint32 _numFiles;
protected:
@@ -110,8 +110,8 @@ class Disk_ns : public Disk {
protected:
Archive _resArchive;
Archive _locArchive;
- char _languageDir[3];
- Parallaction *_vm;
+ char _languageDir[3];
+ Parallaction *_vm;
protected:
void errorFileNotFound(const char *s);
@@ -201,7 +201,7 @@ public:
class DosDisk_br : public Disk {
protected:
- Parallaction *_vm;
+ Parallaction *_vm;
char _partPath[PATH_LEN];
char _languageDir[2];
diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp
index 91a8809070..c7f6464696 100644
--- a/engines/parallaction/exec_ns.cpp
+++ b/engines/parallaction/exec_ns.cpp
@@ -29,7 +29,7 @@
namespace Parallaction {
-#define INST_ON 1
+#define INST_ON 1
#define INST_OFF 2
#define INST_X 3
#define INST_Y 4
@@ -722,8 +722,8 @@ Zone *Parallaction::hitZone(uint32 type, uint16 x, uint16 y) {
_e = ((_si >= a->_left + a->width()) || (_si <= a->_left)) ? 0 : 1; // _e: horizontal range
_f = ((_di >= a->_top + a->height()) || (_di <= a->_top)) ? 0 : 1; // _f: vertical range
- _b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character)
- _c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object
+ _b = ((type != 0) || (a->_type == kZoneYou)) ? 0 : 1; // _b: (no type specified) AND (Animation is not the character)
+ _c = (a->_type & 0xFFFF0000) ? 0 : 1; // _c: Animation is not an object
_d = ((a->_type & 0xFFFF0000) != type) ? 0 : 1; // _d: Animation is an object of the same type
if ((_a != 0 && _e != 0 && _f != 0) && ((_b != 0 && _c != 0) || (a->_type == type) || (_d != 0))) {
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index 07e736a6d3..64d2d170ee 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -239,7 +239,7 @@ public:
class DosDialogueFont : public DosFont {
private:
- static const byte _glyphWidths[126];
+ static const byte _glyphWidths[126];
protected:
uint16 width(byte c) {
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index e2051a85ab..15f08df37a 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -179,7 +179,7 @@ void Palette::rotate(uint first, uint last, bool forward) {
byte tmp[3];
- if (forward) { // forward
+ if (forward) { // forward
tmp[0] = _data[first * 3];
tmp[1] = _data[first * 3 + 1];
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 852e7bb792..2e0930a49e 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -177,8 +177,8 @@ public:
struct Cnv : public Frames {
- uint16 _count; // # of frames
- uint16 _width; //
+ uint16 _count; // # of frames
+ uint16 _width; //
uint16 _height; //
byte** field_8; // unused
byte* _data;
@@ -330,8 +330,8 @@ public:
PaletteFxRange _palettefx[6];
Palette _palette;
- int _backgroundWidth;
- int _backgroundHeight;
+ int _backgroundWidth;
+ int _backgroundHeight;
uint _screenX; // scrolling position
uint _screenY;
diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp
index 8033378c08..93ed953163 100644
--- a/engines/parallaction/gui_ns.cpp
+++ b/engines/parallaction/gui_ns.cpp
@@ -67,11 +67,11 @@ const char *loadGameMsg[] = {
};
-#define BLOCK_WIDTH 16
+#define BLOCK_WIDTH 16
#define BLOCK_HEIGHT 24
-#define BLOCK_X 112
-#define BLOCK_Y 130
+#define BLOCK_X 112
+#define BLOCK_Y 130
#define BLOCK_SELECTION_X (BLOCK_X-1)
#define BLOCK_SELECTION_Y (BLOCK_Y-1)
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index 085d6c0940..05202809a9 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -38,13 +38,13 @@ namespace Parallaction {
// but only 24x24 pixels are actually copied to graphic memory
//
-#define INVENTORY_MAX_ITEMS 30
+#define INVENTORY_MAX_ITEMS 30
#define INVENTORY_FIRST_ITEM 4 // first four entries are used up by verbs
#define INVENTORY_ITEMS_PER_LINE 5
-#define INVENTORY_LINES 6
+#define INVENTORY_LINES 6
-#define INVENTORY_WIDTH (INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
+#define INVENTORY_WIDTH (INVENTORY_ITEMS_PER_LINE*INVENTORYITEM_WIDTH)
#define INVENTORY_HEIGHT (INVENTORY_LINES*INVENTORYITEM_HEIGHT)
diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h
index 8a80c0f316..8c32c09219 100644
--- a/engines/parallaction/inventory.h
+++ b/engines/parallaction/inventory.h
@@ -38,8 +38,8 @@ struct InventoryItem {
uint16 _index; // index to frame in objs file
};
-#define INVENTORYITEM_PITCH 32
-#define INVENTORYITEM_WIDTH 24
+#define INVENTORYITEM_PITCH 32
+#define INVENTORYITEM_WIDTH 24
#define INVENTORYITEM_HEIGHT 24
#define MAKE_INVENTORY_ID(x) (((x) & 0xFFFF) << 16)
@@ -75,7 +75,7 @@ public:
class InventoryRenderer {
Parallaction *_vm;
- Inventory *_inv;
+ Inventory *_inv;
Common::Point _pos;
Graphics::Surface _surf;
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h
index 28904c6d9e..7384878f64 100644
--- a/engines/parallaction/objects.h
+++ b/engines/parallaction/objects.h
@@ -44,17 +44,17 @@ struct Instruction;
struct Program;
enum ZoneTypes {
- kZoneExamine = 1, // zone displays comment if activated
- kZoneDoor = 2, // zone activated on click (after some walk if needed)
- kZoneGet = 4, // for pickable items
- kZoneMerge = 8, // tags items which can be merged in inventory
+ kZoneExamine = 1, // zone displays comment if activated
+ kZoneDoor = 2, // zone activated on click (after some walk if needed)
+ kZoneGet = 4, // for pickable items
+ kZoneMerge = 8, // tags items which can be merged in inventory
kZoneTaste = 0x10, // NEVER USED
kZoneHear = 0x20, // NEVER USED: they ran out of time before integrating sfx
kZoneFeel = 0x40, // NEVER USED
kZoneSpeak = 0x80, // tags NPCs the character can talk with
- kZoneNone = 0x100, // used to prevent parsing on peculiar Animations
- kZoneTrap = 0x200, // zone activated when character enters
- kZoneYou = 0x400, // marks the character
+ kZoneNone = 0x100, // used to prevent parsing on peculiar Animations
+ kZoneTrap = 0x200, // zone activated when character enters
+ kZoneYou = 0x400, // marks the character
kZoneCommand = 0x800
};
@@ -64,14 +64,14 @@ enum ZoneFlags {
kFlagsActive = 2, // Zone/Animation: object is visible
kFlagsRemove = 4, // Zone/Animation: object is soon to be removed
kFlagsActing = 8, // Animation: script execution is active
- kFlagsLocked = 0x10, // Zone: door or switch cannot be toggled
- kFlagsFixed = 0x20, // Zone: Zone item cannot be picked up
- kFlagsNoName = 0x40, // Zone with no name (used to prevent some kEvEnterZone events)
- kFlagsNoMasked = 0x80, // Animation is to be drawn ignoring z buffer
+ kFlagsLocked = 0x10, // Zone: door or switch cannot be toggled
+ kFlagsFixed = 0x20, // Zone: Zone item cannot be picked up
+ kFlagsNoName = 0x40, // Zone with no name (used to prevent some kEvEnterZone events)
+ kFlagsNoMasked = 0x80, // Animation is to be drawn ignoring z buffer
kFlagsLooping = 0x100, // Animation: script is to be executed repeatedly
- kFlagsAdded = 0x200, // NEVER USED in Nippon Safes
- kFlagsCharacter = 0x400, //
- kFlagsNoWalk = 0x800, // Zone: character doesn't need to walk towards object to interact
+ kFlagsAdded = 0x200, // NEVER USED in Nippon Safes
+ kFlagsCharacter = 0x400, //
+ kFlagsNoWalk = 0x800, // Zone: character doesn't need to walk towards object to interact
// BRA specific
kFlagsYourself = 0x1000,
@@ -84,7 +84,7 @@ enum ZoneFlags {
enum CommandFlags {
kFlagsVisited = 1,
kFlagsExit = 0x10000000,
- kFlagsEnter = 0x20000000,
+ kFlagsEnter = 0x20000000,
kFlagsGlobal = 0x40000000,
// BRA specific
@@ -93,7 +93,7 @@ enum CommandFlags {
struct CommandData {
uint32 _flags;
- Animation * _animation;
+ Animation * _animation;
Zone* _zone;
char* _string;
uint16 _callable;
@@ -126,7 +126,7 @@ struct CommandData {
struct Command {
uint16 _id;
- CommandData u;
+ CommandData u;
uint32 _flagsOn;
uint32 _flagsOff;
@@ -138,7 +138,7 @@ typedef ManagedList<Command*> CommandList;
#define NUM_QUESTIONS 20
-#define NUM_ANSWERS 5
+#define NUM_ANSWERS 5
struct Answer {
char* _text;
@@ -206,7 +206,7 @@ struct ExamineData { // size = 28
};
struct DoorData { // size = 28
char* _location;
- Frames *_cnv;
+ Frames *_cnv;
byte* _background;
Common::Point _startPos;
uint16 _startFrame;
@@ -240,7 +240,7 @@ struct MergeData { // size = 12
};
struct TypeData {
- GetData *get;
+ GetData *get;
SpeakData *speak;
ExamineData *examine;
DoorData *door;
@@ -263,7 +263,7 @@ struct TypeData {
struct Zone {
char _name[ZONENAME_LENGTH];
- int16 _left;
+ int16 _left;
int16 _top;
int16 _right;
int16 _bottom;
@@ -273,7 +273,7 @@ struct Zone {
uint16 field_2C; // unused
uint16 field_2E; // unused
TypeData u;
- CommandList _commands;
+ CommandList _commands;
Common::Point _moveTo;
// BRA specific
@@ -314,7 +314,7 @@ enum ParaFlags {
struct ScriptVar {
- uint32 _flags;
+ uint32 _flags;
int16 _value;
int16* _pvalue;
@@ -327,8 +327,8 @@ struct ScriptVar {
void setLocal(LocalVariable *local);
void setField(int16 *field);
- void setImmediate(int16 value);
- void setRandom(int16 seed);
+ void setImmediate(int16 value);
+ void setRandom(int16 seed);
};
enum InstructionFlags {
@@ -378,8 +378,8 @@ struct Program {
Program();
~Program();
- int16 findLocal(const char* name);
- int16 addLocal(const char *name, int16 value = 0, int16 min = -10000, int16 max = 10000);
+ int16 findLocal(const char* name);
+ int16 addLocal(const char *name, int16 value = 0, int16 min = -10000, int16 max = 10000);
};
@@ -387,8 +387,8 @@ struct Program {
struct Animation : public Zone {
Common::Point _oldPos;
- Program *_program;
- Frames *_cnv;
+ Program *_program;
+ Frames *_cnv;
char *_scriptName;
int16 _frame;
uint16 field_50; // unused
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 182749f367..33789b399c 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -548,7 +548,7 @@ bool Parallaction::translateInventoryInput() {
_input._event = kEvCloseInventory;
_input._inventoryIndex = getHoverInventoryItem(_mousePos.x, _mousePos.y);
- highlightInventoryItem(_transCurrentHoverItem, 12); // disable
+ highlightInventoryItem(_transCurrentHoverItem, 12); // disable
if ((_engineFlags & kEngineDragging) == 0) {
return true;
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 283e6164b7..9c5565915e 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -100,17 +100,17 @@ enum {
kMouseLeftUp = 1,
kMouseLeftDown = 2,
kMouseRightUp = 3,
- kMouseRightDown = 4
+ kMouseRightDown = 4
};
enum EngineFlags {
- kEngineQuit = (1 << 0),
+ kEngineQuit = (1 << 0),
kEnginePauseJobs = (1 << 1),
kEngineInventory = (1 << 2),
kEngineWalking = (1 << 3),
kEngineChangeLocation = (1 << 4),
kEngineBlockInput = (1 << 5),
- kEngineDragging = (1 << 6),
+ kEngineDragging = (1 << 6),
kEngineTransformedDonna = (1 << 7)
};
@@ -144,7 +144,7 @@ struct PARALLACTIONGameDescription;
struct Job;
struct Job {
- uint16 _count; // # of executions left
+ uint16 _count; // # of executions left
uint16 _tag; // used for ordering
uint16 _finished;
void * _parm;
@@ -155,27 +155,27 @@ public:
};
-extern uint16 _mouseButtons;
+extern uint16 _mouseButtons;
extern char _password[8];
-extern uint16 _score;
-extern uint16 _language;
-extern uint32 _engineFlags;
-extern Command *_forwardedCommands[];
-extern char _forwardedAnimationNames[][20];
-extern uint16 _numForwards;
-extern char _slideText[][40];
-extern uint16 _introSarcData3; // sarcophagus stuff to be saved
-extern uint16 _introSarcData2; // sarcophagus stuff to be saved
-extern char _saveData1[];
-extern uint32 _commandFlags;
-extern const char *_dinoName;
-extern const char *_donnaName;
-extern const char *_doughName;
-extern const char *_drkiName;
-extern const char *_minidinoName;
-extern const char *_minidonnaName;
-extern const char *_minidoughName;
-extern const char *_minidrkiName;
+extern uint16 _score;
+extern uint16 _language;
+extern uint32 _engineFlags;
+extern Command *_forwardedCommands[];
+extern char _forwardedAnimationNames[][20];
+extern uint16 _numForwards;
+extern char _slideText[][40];
+extern uint16 _introSarcData3; // sarcophagus stuff to be saved
+extern uint16 _introSarcData2; // sarcophagus stuff to be saved
+extern char _saveData1[];
+extern uint32 _commandFlags;
+extern const char *_dinoName;
+extern const char *_donnaName;
+extern const char *_doughName;
+extern const char *_drkiName;
+extern const char *_minidinoName;
+extern const char *_minidonnaName;
+extern const char *_minidoughName;
+extern const char *_minidrkiName;
void waitUntilLeftClick();
@@ -216,7 +216,7 @@ struct Character {
Animation _ani;
Frames *_head;
Frames *_talk;
- Frames *_objs;
+ Frames *_objs;
PathBuilder _builder;
WalkNodeList *_walkPath;
@@ -372,10 +372,10 @@ public:
virtual bool loadGame() = 0;
virtual bool saveGame() = 0;
- uint16 readInput();
+ uint16 readInput();
void updateInput();
- void waitTime(uint32 t);
+ void waitTime(uint32 t);
enum {
kInputModeGame = 0,
@@ -389,7 +389,7 @@ public:
uint _lookup;
Common::Stack<OpcodeSet*> _opcodes;
- Common::Stack<Table*> _statements;
+ Common::Stack<Table*> _statements;
OpcodeSet *_currentOpcodes;
Table *_currentStatements;
void pushParserTables(OpcodeSet *opcodes, Table* statements);
@@ -415,32 +415,32 @@ public:
void showCursor(bool visible);
- Job *addJob(uint functionId, void *parm, uint16 tag);
- void removeJob(Job *j);
- void pauseJobs();
- void resumeJobs();
- void runJobs();
+ Job *addJob(uint functionId, void *parm, uint16 tag);
+ void removeJob(Job *j);
+ void pauseJobs();
+ void resumeJobs();
+ void runJobs();
virtual JobOpcode* createJobOpcode(uint functionId, Job *job) = 0;
- void finalizeWalk(WalkNodeList *list);
- int16 selectWalkFrame(const Common::Point& pos, const WalkNode* from);
- void clipMove(Common::Point& pos, const WalkNode* from);
+ void finalizeWalk(WalkNodeList *list);
+ int16 selectWalkFrame(const Common::Point& pos, const WalkNode* from);
+ void clipMove(Common::Point& pos, const WalkNode* from);
- Zone *findZone(const char *name);
- Zone *hitZone(uint32 type, uint16 x, uint16 y);
+ Zone *findZone(const char *name);
+ Zone *hitZone(uint32 type, uint16 x, uint16 y);
uint16 runZone(Zone*);
- void freeZones();
+ void freeZones();
- void runDialogue(SpeakData*);
+ void runDialogue(SpeakData*);
- void runCommands(CommandList& list, Zone *z = NULL);
+ void runCommands(CommandList& list, Zone *z = NULL);
- Animation *findAnimation(const char *name);
+ Animation *findAnimation(const char *name);
void sortAnimations();
- void freeAnimations();
+ void freeAnimations();
- void setBackground(const char *background, const char *mask, const char *path);
- void freeBackground();
+ void setBackground(const char *background, const char *mask, const char *path);
+ void freeBackground();
Table *_globalTable;
Table *_objectsNames;
@@ -461,8 +461,8 @@ private:
public:
// info
int32 _screenWidth;
- int32 _screenHeight;
- int32 _screenSize;
+ int32 _screenHeight;
+ int32 _screenSize;
PathBuffer *_pathBuffer;
@@ -486,10 +486,10 @@ public:
p = _mousePos;
}
- Zone *_activeZone;
+ Zone *_activeZone;
- ZoneList _zones;
- AnimationList _animations;
+ ZoneList _zones;
+ AnimationList _animations;
Font *_labelFont;
Font *_menuFont;
@@ -522,7 +522,7 @@ protected: // data
int16 _transCurrentHoverItem;
uint32 _baseTime;
- char _characterName1[50]; // only used in changeCharacter
+ char _characterName1[50]; // only used in changeCharacter
JobList _jobs;
@@ -545,9 +545,9 @@ protected: // members
uint32 getElapsedTime();
void resetTimer();
- InputData *translateInput();
- bool translateGameInput();
- bool translateInventoryInput();
+ InputData *translateInput();
+ bool translateGameInput();
+ bool translateInventoryInput();
void processInput(InputData*);
@@ -556,17 +556,17 @@ protected: // members
virtual void changeLocation(char *location) = 0;
virtual void changeCharacter(const char *name) = 0;
void allocateLocationSlot(const char *name);
- void finalizeLocationParsing();
- void freeLocation();
- void showLocationComment(const char *text, bool end);
+ void finalizeLocationParsing();
+ void freeLocation();
+ void showLocationComment(const char *text, bool end);
- void displayComment(ExamineData *data);
+ void displayComment(ExamineData *data);
- uint16 checkDoor();
+ uint16 checkDoor();
- void freeCharacter();
+ void freeCharacter();
- int16 pickupItem(Zone *z);
+ int16 pickupItem(Zone *z);
public:
virtual void callFunction(uint index, void* parm) { }
@@ -675,8 +675,8 @@ public:
typedef void (Parallaction_ns::*JobFn)(void*, Job*);
- const JobFn *_jobsFn;
- JobOpcode* createJobOpcode(uint functionId, Job *job);
+ const JobFn *_jobsFn;
+ JobOpcode* createJobOpcode(uint functionId, Job *job);
bool loadGame();
bool saveGame();
@@ -776,8 +776,8 @@ protected:
const char *filename;
Script *script;
- Zone *z;
- Animation *a;
+ Zone *z;
+ Animation *a;
int nextToken;
CommandList *list;
bool endcommands;
@@ -847,14 +847,14 @@ protected:
void parseZone(Script &script, ZoneList &list, char *name);
void parseZoneTypeBlock(Script &script, Zone *z);
- void parseWalkNodes(Script& script, WalkNodeList &list);
+ void parseWalkNodes(Script& script, WalkNodeList &list);
Animation *parseAnimation(Script &script, AnimationList &list, char *name);
void parseCommands(Script &script, CommandList&);
void parseCommandFlags();
void createCommand(uint id);
void addCommand();
- void initOpcodes();
- void initParsers();
+ void initOpcodes();
+ void initParsers();
// program parser
OpcodeSet _instructionParsers;
@@ -891,7 +891,7 @@ protected:
void loadProgram(Animation *a, const char *filename);
void parseLValue(ScriptVar &var, const char *str);
virtual void parseRValue(ScriptVar &var, const char *str);
- void wrapLocalVar(LocalVariable *local);
+ void wrapLocalVar(LocalVariable *local);
DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid);
DECLARE_UNQUALIFIED_COMMAND_OPCODE(set);
@@ -931,14 +931,14 @@ protected:
void guiStart();
int guiSelectCharacter();
- void guiSplash();
+ void guiSplash();
int guiNewGame();
uint16 guiChooseLanguage();
uint16 guiSelectGame();
int guiGetSelectedBlock(const Common::Point &p);
- void switchBackground(const char* background, const char* mask);
- void showSlide(const char *name);
+ void switchBackground(const char* background, const char* mask);
+ void showSlide(const char *name);
};
@@ -974,10 +974,10 @@ public:
int _zeta2;
int16 _lipSyncVal;
- uint _subtitleLipSync;
+ uint _subtitleLipSync;
- Label _subtitle0;
- Label _subtitle1;
+ Label _subtitle0;
+ Label _subtitle1;
Zone *_activeZone2;
@@ -986,11 +986,11 @@ public:
uint32 _zoneFlags[NUM_LOCATIONS][NUM_ZONES];
private:
- void initResources();
- void initFonts();
- void freeFonts();
- void initOpcodes();
- void initParsers();
+ void initResources();
+ void initFonts();
+ void freeFonts();
+ void initOpcodes();
+ void initParsers();
void initJobs();
void setArrowCursor();
@@ -998,10 +998,10 @@ private:
typedef void (Parallaction_br::*JobFn)(void*, Job*);
- const JobFn *_jobsFn;
- JobOpcode* createJobOpcode(uint functionId, Job *job);
+ const JobFn *_jobsFn;
+ JobOpcode* createJobOpcode(uint functionId, Job *job);
- void changeLocation(char *location);
+ void changeLocation(char *location);
void changeCharacter(const char *name);
void initPart();
@@ -1011,10 +1011,10 @@ private:
void setMousePointer(int16 index);
void initCursors();
- Frames *_dinoCursor;
+ Frames *_dinoCursor;
Frames *_dougCursor;
Frames *_donnaCursor;
- Frames *_mouseArrow;
+ Frames *_mouseArrow;
int showMenu();
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index d4fcceafd5..1f83c346bd 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -779,10 +779,10 @@ void Parallaction_br::parseRValue(ScriptVar &v, const char *str) {
typedef OpcodeImpl<Parallaction_br> OpcodeV2;
#define INSTRUCTION_PARSER(sig) OpcodeV2(this, &Parallaction_br::instParse_##sig)
-#define ZONE_PARSER(sig) OpcodeV2(this, &Parallaction_br::locZoneParse_##sig)
-#define ANIM_PARSER(sig) OpcodeV2(this, &Parallaction_br::locAnimParse_##sig)
-#define LOCATION_PARSER(sig) OpcodeV2(this, &Parallaction_br::locParse_##sig)
-#define COMMAND_PARSER(sig) OpcodeV2(this, &Parallaction_br::cmdParse_##sig)
+#define ZONE_PARSER(sig) OpcodeV2(this, &Parallaction_br::locZoneParse_##sig)
+#define ANIM_PARSER(sig) OpcodeV2(this, &Parallaction_br::locAnimParse_##sig)
+#define LOCATION_PARSER(sig) OpcodeV2(this, &Parallaction_br::locParse_##sig)
+#define COMMAND_PARSER(sig) OpcodeV2(this, &Parallaction_br::cmdParse_##sig)
#define WARNING_PARSER(sig) OpcodeV2(this, &Parallaction_br::warning_##sig)
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index b593cc23bf..6cd298ea0c 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -29,16 +29,16 @@
namespace Parallaction {
-#define CMD_SET 1
+#define CMD_SET 1
#define CMD_CLEAR 2
#define CMD_START 3
#define CMD_SPEAK 4
-#define CMD_GET 5
+#define CMD_GET 5
#define CMD_LOCATION 6
#define CMD_OPEN 7
#define CMD_CLOSE 8
#define CMD_ON 9
-#define CMD_OFF 10
+#define CMD_OFF 10
#define CMD_CALL 11
#define CMD_TOGGLE 12
#define CMD_DROP 13
@@ -46,7 +46,7 @@ namespace Parallaction {
#define CMD_MOVE 15
#define CMD_STOP 16
-#define INST_ON 1
+#define INST_ON 1
#define INST_OFF 2
#define INST_X 3
#define INST_Y 4
@@ -1034,10 +1034,10 @@ void Parallaction_ns::parseWalkNodes(Script& script, WalkNodeList &list) {
typedef OpcodeImpl<Parallaction_ns> OpcodeV1;
#define INSTRUCTION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::instParse_##sig)
-#define ZONE_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locZoneParse_##sig)
-#define ANIM_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locAnimParse_##sig)
-#define LOCATION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locParse_##sig)
-#define COMMAND_PARSER(sig) OpcodeV1(this, &Parallaction_ns::cmdParse_##sig)
+#define ZONE_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locZoneParse_##sig)
+#define ANIM_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locAnimParse_##sig)
+#define LOCATION_PARSER(sig) OpcodeV1(this, &Parallaction_ns::locParse_##sig)
+#define COMMAND_PARSER(sig) OpcodeV1(this, &Parallaction_ns::cmdParse_##sig)
#define WARNING_PARSER(sig) OpcodeV1(this, &Parallaction_br::warning_##sig)
diff --git a/engines/parallaction/sound.h b/engines/parallaction/sound.h
index 9d6ea01485..8842558ae9 100644
--- a/engines/parallaction/sound.h
+++ b/engines/parallaction/sound.h
@@ -46,8 +46,8 @@ class MidiPlayer;
class SoundMan {
protected:
- Parallaction *_vm;
- Audio::Mixer *_mixer;
+ Parallaction *_vm;
+ Audio::Mixer *_mixer;
char _musicFile[PATH_LEN];
public:
@@ -67,7 +67,7 @@ public:
class DosSoundMan : public SoundMan {
- MidiPlayer *_midiPlayer;
+ MidiPlayer *_midiPlayer;
int _musicData1;
public:
diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp
index d35132fc35..3b5948fe92 100644
--- a/engines/parallaction/walk.cpp
+++ b/engines/parallaction/walk.cpp
@@ -31,7 +31,7 @@ static uint16 _doorData1 = 1000;
static Zone *_zoneTrap = NULL;
static uint16 walkData1 = 0;
-static uint16 walkData2 = 0; // next walk frame
+static uint16 walkData2 = 0; // next walk frame
inline byte PathBuffer::getValue(uint16 x, uint16 y) {
diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h
index e06ef02741..fea83e5a23 100644
--- a/engines/parallaction/walk.h
+++ b/engines/parallaction/walk.h
@@ -48,7 +48,7 @@ public:
typedef ManagedList<WalkNode*> WalkNodeList;
-void jobWalk(void*, Job *j);
+void jobWalk(void*, Job *j);
struct PathBuffer {
// handles a 1-bit depth buffer used for masking non-walkable areas
@@ -86,10 +86,10 @@ public:
class PathBuilder {
- Animation *_anim;
+ Animation *_anim;
- WalkNodeList *_list;
- Common::List<WalkNode*> _subPath;
+ WalkNodeList *_list;
+ Common::List<WalkNode*> _subPath;
void correctPathPoint(Common::Point &to);
uint32 buildSubPath(const Common::Point& pos, const Common::Point& stop);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 19:13:38 +0000