aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-06-14 11:52:34 +0000
committerMax Horn2003-06-14 11:52:34 +0000
commitaa83d4fd3175b62bbf272c38513d177cb0f1d5b0 (patch)
treeea7cb72bda71acf973329794080d566bd307d841 /scumm
parent90b96f2e164115db20add0ad571d7ad2e6d0706e (diff)
downloadscummvm-rg350-aa83d4fd3175b62bbf272c38513d177cb0f1d5b0.tar.gz
scummvm-rg350-aa83d4fd3175b62bbf272c38513d177cb0f1d5b0.tar.bz2
scummvm-rg350-aa83d4fd3175b62bbf272c38513d177cb0f1d5b0.zip
cleanup
svn-id: r8467
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.h5
-rw-r--r--scumm/scummvm.cpp5
2 files changed, 3 insertions, 7 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h
index bd36c94966..fcbf0a3db9 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1072,10 +1072,11 @@ public:
int _2byteHeight;
int _2byteWidth;
byte *get2byteCharPtr(int idx);
-
-
+
protected:
+ byte *_2byteFontPtr;
+
#if defined(SCUMM_LITTLE_ENDIAN)
uint32 fileReadDword() { return _fileHandle.readUint32LE(); }
#elif defined(SCUMM_BIG_ENDIAN)
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index e07c3b832e..c95a32103b 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -60,11 +60,6 @@ extern void drawError(char*);
Scumm *g_scumm = 0;
ScummDebugger *g_debugger;
-byte *_2byteFontPtr;
-int _2byteWidth;
-int _2byteHeight;
-bool _CJKMode;
-
byte *Scumm::get2byteCharPtr(int idx) {
/*
switch(language)