aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/zone.h
diff options
context:
space:
mode:
authorNicola Mettifogo2007-03-18 21:15:39 +0000
committerNicola Mettifogo2007-03-18 21:15:39 +0000
commit0bc056aee3a32de9df83d1e12417a2ae7d854651 (patch)
treecc6113782d972955497d3ef1c53c4176440a9337 /engines/parallaction/zone.h
parent992f5357243a8ff80316ca2efbfa2e7dab31b7b0 (diff)
downloadscummvm-rg350-0bc056aee3a32de9df83d1e12417a2ae7d854651.tar.gz
scummvm-rg350-0bc056aee3a32de9df83d1e12417a2ae7d854651.tar.bz2
scummvm-rg350-0bc056aee3a32de9df83d1e12417a2ae7d854651.zip
Made loadStatic return a new StaticCnv instead of accepting a parameter. All disk functions now accept only a resource name as their parameter.
svn-id: r26232
Diffstat (limited to 'engines/parallaction/zone.h')
-rw-r--r--engines/parallaction/zone.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/parallaction/zone.h b/engines/parallaction/zone.h
index c9d53d2f20..87b421a9b3 100644
--- a/engines/parallaction/zone.h
+++ b/engines/parallaction/zone.h
@@ -91,7 +91,7 @@ struct Question {
struct GetData { // size = 24
uint32 _icon;
- StaticCnv _cnv;
+ StaticCnv *_cnv;
byte *_backup;
uint16 field_14; // unused
uint16 field_16; // unused
@@ -99,6 +99,7 @@ struct GetData { // size = 24
GetData() {
_icon = 0;
_backup = NULL;
+ _cnv = NULL;
}
};
struct SpeakData { // size = 36
@@ -111,7 +112,7 @@ struct SpeakData { // size = 36
}
};
struct ExamineData { // size = 28
- StaticCnv _cnv;
+ StaticCnv *_cnv;
uint16 _opBase; // unused
uint16 field_12; // unused
char* _description;
@@ -121,6 +122,7 @@ struct ExamineData { // size = 28
_opBase = 0;
_description = NULL;
_filename = NULL;
+ _cnv = NULL;
}
};
struct DoorData { // size = 28