aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.h
diff options
context:
space:
mode:
authorMax Horn2002-09-22 01:17:53 +0000
committerMax Horn2002-09-22 01:17:53 +0000
commita681eb029e7fc5b0383d5cdfce2c561e8fa221d2 (patch)
tree62c79d406f1fdd730eb8000e25a42ecd557a990d /scumm/scumm.h
parent45ce1d111312ec413d6d680092f98a4f49e31556 (diff)
downloadscummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.tar.gz
scummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.tar.bz2
scummvm-rg350-a681eb029e7fc5b0383d5cdfce2c561e8fa221d2.zip
renamec string -> _string and sentence -> _sentence in class Scumm (I originally reworked StringTab, but then noticed the save game format depends on it <sigh>)
svn-id: r4995
Diffstat (limited to 'scumm/scumm.h')
-rw-r--r--scumm/scumm.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 384f8ca1b2..4a7537f92f 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -238,10 +238,13 @@ struct SentenceTab {
byte unk2;
uint16 unk4;
uint16 unk3;
- byte unk;
+ int8 unk;
byte pad;
};
+// TODO / FIXME: next time save game format changes, Fingolfin would like to
+// revise StringTab. In particular, all t_* fields can be removed, making some
+// code a bit cleaner & easier to understand.
struct StringTab {
int16 t_xpos, t_ypos;
int16 t_right;
@@ -721,8 +724,8 @@ public:
/* Actor talking stuff */
byte _actorToPrintStrFor;
int _sentenceNum;
- SentenceTab sentence[6];
- StringTab string[6];
+ SentenceTab _sentence[6];
+ StringTab _string[6];
void actorTalk();
void stopTalk();