aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2007-03-17 20:51:13 +0000
committerNicola Mettifogo2007-03-17 20:51:13 +0000
commit74f7a908866a316ae559012f2229b77e51b6eee0 (patch)
tree252d5aeaa6a74d73a37581c3d7238064e54af679 /engines
parentb80dab6c73819edbe2a21903e313b565630a87a3 (diff)
downloadscummvm-rg350-74f7a908866a316ae559012f2229b77e51b6eee0.tar.gz
scummvm-rg350-74f7a908866a316ae559012f2229b77e51b6eee0.tar.bz2
scummvm-rg350-74f7a908866a316ae559012f2229b77e51b6eee0.zip
renamed structures to be more general
svn-id: r26184
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/defs.h2
-rw-r--r--engines/parallaction/graphics.cpp4
-rw-r--r--engines/parallaction/parallaction.h2
-rw-r--r--engines/parallaction/zone.cpp6
-rw-r--r--engines/parallaction/zone.h8
5 files changed, 11 insertions, 11 deletions
diff --git a/engines/parallaction/defs.h b/engines/parallaction/defs.h
index 8f19fc187a..f2005bc8db 100644
--- a/engines/parallaction/defs.h
+++ b/engines/parallaction/defs.h
@@ -93,7 +93,7 @@ public:
struct Animation;
struct Zone;
-struct ZoneLabel;
+struct Label;
struct Command;
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 8411f34883..632735614e 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -413,7 +413,7 @@ void Gfx::blit(const Common::Rect& r, uint16 z, byte *data, Gfx::Buffers buffer)
void jobDisplayLabel(void *parm, Job *j) {
- ZoneLabel *label = (ZoneLabel*)parm;
+ Label *label = (Label*)parm;
debugC(1, kDebugJobs, "jobDisplayLabel (%p)", (const void*) label);
if (label->_cnv._width == 0)
@@ -424,7 +424,7 @@ void jobDisplayLabel(void *parm, Job *j) {
}
void jobEraseLabel(void *parm, Job *j) {
- ZoneLabel *label = (ZoneLabel*)parm;
+ Label *label = (Label*)parm;
debugC(1, kDebugJobs, "jobEraseLabel (%p)", (const void*) label);
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index d0fe3cc4c5..1818b2cbe6 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -343,7 +343,7 @@ protected: // data
int16 _inventoryIndex;
Zone* _zone;
- ZoneLabel* _label;
+ Label* _label;
};
bool _skipMenu;
diff --git a/engines/parallaction/zone.cpp b/engines/parallaction/zone.cpp
index 181fa23ec4..738e30c968 100644
--- a/engines/parallaction/zone.cpp
+++ b/engines/parallaction/zone.cpp
@@ -128,7 +128,7 @@ void freeZones(Node *list) {
for (; z; ) {
- // WORKAROUND: this huge condition is needed because we made ZoneTypeData a collection of structs
+ // WORKAROUND: this huge condition is needed because we made TypeData a collection of structs
// instead of an union. So, merge->_obj1 and get->_icon were just aliases in the original engine,
// but we need to check it separately here. The same workaround is applied in hitZone.
if (((z->_top == -1) ||
@@ -208,7 +208,7 @@ void freeZones(Node *list) {
void Parallaction::parseZoneTypeBlock(Script &script, Zone *z) {
// printf("parseZoneTypeBlock()");
- ZoneTypeData *u = &z->u;
+ TypeData *u = &z->u;
switch (z->_type & 0xFFFF) {
case kZoneExamine: // examine Zone alloc
@@ -589,7 +589,7 @@ Zone *hitZone(uint32 type, uint16 x, uint16 y) {
// out of Zone, so look for special values
if ((z->_left == -2) || (z->_left == -3)) {
- // WORKAROUND: this huge condition is needed because we made ZoneTypeData a collection of structs
+ // WORKAROUND: this huge condition is needed because we made TypeData a collection of structs
// instead of an union. So, merge->_obj1 and get->_icon were just aliases in the original engine,
// but we need to check it separately here. The same workaround is applied in freeZones.
if ((((z->_type & 0xFFFF) == kZoneMerge) && (((_si == z->u.merge->_obj1) && (_di == z->u.merge->_obj2)) || ((_si == z->u.merge->_obj2) && (_di == z->u.merge->_obj1)))) ||
diff --git a/engines/parallaction/zone.h b/engines/parallaction/zone.h
index ef878eb41e..956b0e4bb5 100644
--- a/engines/parallaction/zone.h
+++ b/engines/parallaction/zone.h
@@ -109,7 +109,7 @@ struct MergeData { // size = 12
uint32 _obj3;
};
-struct ZoneTypeData {
+struct TypeData {
GetData *get;
SpeakData *speak;
ExamineData *examine;
@@ -118,7 +118,7 @@ struct ZoneTypeData {
MergeData *merge;
};
-struct ZoneLabel {
+struct Label {
char* _text;
StaticCnv _cnv;
};
@@ -134,10 +134,10 @@ struct Zone : public Node {
uint32 _type;
uint32 _flags;
- ZoneLabel _label;
+ Label _label;
uint16 field_2C; // unused
uint16 field_2E; // unused
- ZoneTypeData u;
+ TypeData u;
Command *_commands;
Point _moveTo;