aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/avalanche/background.cpp2
-rw-r--r--engines/avalanche/background.h2
-rw-r--r--engines/avalanche/closing.cpp5
-rw-r--r--engines/avalanche/closing.h14
-rw-r--r--engines/avalanche/graphics.h5
-rw-r--r--engines/avalanche/gyro.h31
-rw-r--r--engines/avalanche/lucerna.cpp17
7 files changed, 12 insertions, 64 deletions
diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index d9f606b74e..3a70fd7915 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -359,8 +359,6 @@ void Background::drawBackgroundSprite(int16 destX, int16 destY, byte sprId) {
}
}
-
-
void Background::drawSprite(int16 x, int16 y, SpriteType &sprite) {
_r._x1 = x;
_r._y1 = y;
diff --git a/engines/avalanche/background.h b/engines/avalanche/background.h
index 915abb9f90..d38106d38f 100644
--- a/engines/avalanche/background.h
+++ b/engines/avalanche/background.h
@@ -71,7 +71,7 @@ private:
SpriteType _sprites[40];
ByteField _r;
Common::String _filename;
- static const int16 kOnDisk; // Value of memos[fv].x when it's not in memory.
+ static const int16 kOnDisk; // Value of _sprites[fv]._x when it's not in memory.
void drawSprite(int16 x, int16 y, SpriteType &sprite);
};
diff --git a/engines/avalanche/closing.cpp b/engines/avalanche/closing.cpp
index 85d5fe0bb8..39f177e6aa 100644
--- a/engines/avalanche/closing.cpp
+++ b/engines/avalanche/closing.cpp
@@ -75,9 +75,4 @@ void Closing::exitGame() {
showScreen(); // No halt- it's already set up.
}
-// CHECKME: Useless?
-// void Closing::handleBug() {
-// warning("STUB: Closing::handleBug()");
-//}
-
} // End of namespace Avalanche.
diff --git a/engines/avalanche/closing.h b/engines/avalanche/closing.h
index a2543fd3af..b4c80a8e89 100644
--- a/engines/avalanche/closing.h
+++ b/engines/avalanche/closing.h
@@ -42,12 +42,12 @@ public:
void exitGame();
private:
-// CHECKME: Useless values?
+ // Will be needed during implementation of Closing.
enum ScreenType {
-// kScreenBugAlert = 1,
-// kScreenRamCram = 2,
-// kScreenTwoCopies = 5,
- kScreenNagScreen = 3
+ kScreenBugAlert = 1,
+ kScreenRamCram = 2,
+ kScreenNagScreen = 3,
+ kScreenTwoCopies = 5
};
AvalancheEngine *_vm;
@@ -56,10 +56,6 @@ private:
void showScreen();
void putIn(Common::String str, uint16 where);
- // CHECKME: Unused?
- // Common::String q; //absolute $B8FA:0* ; Nobody's using the graphics memory now.
- // Common::File f;
- // void handleBug();
};
} // End of namespace Avalanche.
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index 7706c5f75e..4cf338bb3f 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -36,9 +36,10 @@
namespace Avalanche {
class AvalancheEngine;
-typedef byte FontType[256][16]; // raw font type
+typedef byte FontType[256][16];
-typedef byte ManiType[2049]; // manitype = array[5..2053] of byte;
+typedef byte ManiType[2049];
+// manitype = array[5..2053] of byte;
// Be aware!!!
typedef byte SilType[51][11]; // 35, 4
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index 16d7df22ba..67ca2cfbd1 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -107,37 +107,6 @@ struct Sundry { // Things which must be saved over a backtobootstrap, outside DN
byte _qThinks;
bool _qThinkThing;
};
-
-struct ednahead { // Edna header
- // This header starts at byte offset 177 in the .ASG file.
- char id[9]; // signature
- uint16 revision; // EDNA revision, here 2 (1=dna256)
- Common::String game; // Long name, eg Lord Avalot D'Argent
- Common::String shortname; // Short name, eg Avalot
- uint16 number; // Game's code number, here 2
- uint16 ver; // Version number as int16 (eg 1.00 = 100)
- Common::String verstr; // Vernum as Common::String (eg 1.00 = "1.00")
- Common::String filename; // Filename, eg AVALOT.EXE
- byte osbyte; // Saving OS (here 1=DOS. See below for others.
- Common::String os; // Saving OS in text format.
-
- // Info on this particular game
-
- Common::String fn; // Filename (not extension ('cos that's .ASG))
- byte d, m; // D, M, Y are the Day, Month & Year this game was...
- uint16 y; // ...saved on.
- Common::String desc; // Description of game (same as in Avaricius!)
- uint16 len; // Length of DNA (it's not going to be above 65535!)
-
- // Quick reference & miscellaneous
-
- uint16 saves; // no. of times this game has been saved
- int16 cash; // contents of your wallet in numerical form
- Common::String money; // ditto in Common::String form (eg 5/-, or 1 denarius)
- uint16 points; // your score
-
- // DNA values follow, then footer (which is ignored)
-};
#endif
class Gyro {
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 98a9775323..539bb40ed8 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -173,8 +173,6 @@ void Lucerna::drawAlsoLines() {
CursorMan.showMouse(true);
}
-// readAlsoStringFromFile, scram and unScramble are only used in loadAlso
-
/**
* Check is it's possible to give something to Spludwick
* @remarks Originally called 'nextstring'
@@ -438,7 +436,6 @@ void Lucerna::enterRoom(byte room, byte ped) {
if ((_vm->_gyro->_lastRoom == kRoomMap) && (_vm->_gyro->_lastRoomNotMap != _vm->_gyro->_room))
enterNewTown();
-
switch (room) {
case kRoomYours:
if (_vm->_gyro->_avvyInBed) {
@@ -855,6 +852,8 @@ void Lucerna::thinkAbout(byte object, bool type) {
object--; // Last time...
}
+ CursorMan.showMouse(false);
+
file.seek(object * picSize + 65);
::Graphics::Surface picture = _vm->_graphics->loadPictureGraphic(file);
_vm->_graphics->drawPicture(_vm->_graphics->_surface, picture, 205, 170);
@@ -862,12 +861,6 @@ void Lucerna::thinkAbout(byte object, bool type) {
picture.free();
file.close();
- CursorMan.showMouse(false);
-
-#if 0
- putimage(x, y, p, 0);
-#endif
-
CursorMan.showMouse(true);
_vm->_gyro->_thinkThing = type;
}
@@ -935,7 +928,7 @@ void Lucerna::drawScore() {
_vm->_gyro->_scoreToDisplay[i] = numbers[i];
}
-void Lucerna::incScore(byte num) { // Add on no. of points
+void Lucerna::incScore(byte num) {
for (int i = 1; i <= num; i++) {
_vm->_gyro->_dnascore++;
@@ -1214,10 +1207,6 @@ uint16 Lucerna::bearing(byte whichPed) {
}
/**
- * A sprite run is performed before displaying a scroll, if not all the
- * sprites are still. It performs two fast cycles, only using a few of
- * the links usually used, and without any extra animation. This should
- * make the sprites the same on both pages.
* @remarks Originally called 'sprite_run'
*/
void Lucerna::spriteRun() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 01:20:37 +0000