aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/avalanche/basher2.cpp4
-rw-r--r--engines/avalanche/dropdown2.cpp2
-rw-r--r--engines/avalanche/gyro2.h4
-rw-r--r--engines/avalanche/scrolls2.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/avalanche/basher2.cpp b/engines/avalanche/basher2.cpp
index 355bdaf715..16122fa664 100644
--- a/engines/avalanche/basher2.cpp
+++ b/engines/avalanche/basher2.cpp
@@ -87,9 +87,9 @@ void Basher::plottext() {
_vm->_graphics->drawBar(24, 161, 640, 169, black); // Black out the line of the text.
// Draw the text. Similar to chalk(), but here we don't have to bother with the color of the characters.
- for (byte i = 0; i < _vm->_gyro->current.size(); i++)
+ for (byte i = 0; i < _vm->_gyro->inputText.size(); i++)
for (byte j = 0; j < 8; j++) {
- byte pixel = _vm->_gyro->little[_vm->_gyro->current[i]][j];
+ byte pixel = _vm->_gyro->characters[_vm->_gyro->inputText[i]][j];
for (byte bit = 0; bit < 8; bit++) {
byte pixelBit = (pixel >> bit) & 1;
if (pixelBit != 0)
diff --git a/engines/avalanche/dropdown2.cpp b/engines/avalanche/dropdown2.cpp
index d2282c97bb..bc8414d1a6 100644
--- a/engines/avalanche/dropdown2.cpp
+++ b/engines/avalanche/dropdown2.cpp
@@ -287,7 +287,7 @@ void Dropdown::chalk(int16 x, int16 y, char t, Common::String z, bool valid) {
for (byte fv = 0; fv < z.size(); fv++)
for (byte ff = 0; ff < 8; ff++) {
- byte pixel = ~(_vm->_gyro->little[z[fv]][ff] & ander); // Note that it's the bitwise NOT operator!
+ byte pixel = ~(_vm->_gyro->characters[z[fv]][ff] & ander); // Note that it's the bitwise NOT operator!
for (byte bit = 0; bit < 8; bit++) {
byte pixelBit = (pixel >> bit) & 1;
*_vm->_graphics->getPixel(x * 8 + fv * 8 + 7 - bit, y + ff) = pixelBit + (pixelBit << 1) + (pixelBit << 2);
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index b2fc47fbf5..3eee0772b7 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -481,7 +481,7 @@ public:
- Common::String current;
+ Common::String inputText;
byte curpos;
bool cursoron;
/* previous:^previoustype;*/
@@ -547,7 +547,7 @@ public:
Common::String atkey; /* For XTs, set to "alt-". For ATs, set to "f1". */
byte cp, ledstatus, defaultled;
- raw little;
+ raw characters;
bool quote; /* 66 or 99 next? */
bool alive;
char buffer[2000];
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 63358630c4..8250880f98 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -315,7 +315,7 @@ void Scrolls::loadfont() {
return;
}
for (int16 i = 0; i < 256; i++)
- f.read(_vm->_gyro->little[i],16);
+ f.read(_vm->_gyro->characters[i],16);
f.close();
}