aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/text.h
diff options
context:
space:
mode:
authorStrangerke2011-07-31 00:52:35 +0200
committerStrangerke2011-07-31 00:52:35 +0200
commit55df4d063596c774969a8d3537c999a95b7dfcc0 (patch)
treed1f0f24affff10e89b8a9d4d8a55d31f20d73171 /engines/cge/text.h
parentb53ffa8f2c31d27ac5a7b3fd48143102be6ff4ff (diff)
downloadscummvm-rg350-55df4d063596c774969a8d3537c999a95b7dfcc0.tar.gz
scummvm-rg350-55df4d063596c774969a8d3537c999a95b7dfcc0.tar.bz2
scummvm-rg350-55df4d063596c774969a8d3537c999a95b7dfcc0.zip
CGE: Rename some class members, various clean up
Diffstat (limited to 'engines/cge/text.h')
-rw-r--r--engines/cge/text.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/engines/cge/text.h b/engines/cge/text.h
index 196bfc4edb..6ed5b32b22 100644
--- a/engines/cge/text.h
+++ b/engines/cge/text.h
@@ -33,11 +33,9 @@
namespace CGE {
-#ifndef SYSTXT_MAX
-#define SYSTXT_MAX 1000
-#endif
+#define kSysTextMax 1000
-#define SAY_EXT ".SAY"
+#define kSayExt ".SAY"
#define NOT_VGA_TEXT 90
#define BAD_CHIP_TEXT 91
@@ -54,7 +52,7 @@ namespace CGE {
class Text {
struct Han {
int _ref;
- char *_txt;
+ char *_text;
} *_cache;
int _size;
char _fileName[kPathMax];
@@ -66,7 +64,7 @@ public:
void clear(int from = 1, int upto = 0x7FFF);
void preload(int from = 1, int upto = 0x7FFF);
char *getText(int ref);
- void say(const char *txt, Sprite *spr);
+ void say(const char *text, Sprite *spr);
private:
CGEEngine *_vm;
};
@@ -74,9 +72,9 @@ private:
extern Talk *_talk;
extern Text *_text;
-void say(const char *txt, Sprite *spr);
+void say(const char *text, Sprite *spr);
void sayTime(Sprite *spr);
-void inf(const char *txt);
+void inf(const char *text);
void killText();
} // End of namespace CGE