aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/avalanche/avalot.cpp21
-rw-r--r--engines/avalanche/celer2.h2
-rw-r--r--engines/avalanche/enid2.cpp38
-rw-r--r--engines/avalanche/enid2.h2
-rw-r--r--engines/avalanche/graphics.cpp4
-rw-r--r--engines/avalanche/graphics.h8
-rw-r--r--engines/avalanche/gyro2.h326
-rw-r--r--engines/avalanche/lucerna2.cpp200
-rw-r--r--engines/avalanche/lucerna2.h6
-rw-r--r--engines/avalanche/parser.cpp8
-rw-r--r--engines/avalanche/pingo2.cpp26
-rw-r--r--engines/avalanche/scrolls2.h8
-rw-r--r--engines/avalanche/sequence2.cpp18
-rw-r--r--engines/avalanche/timeout2.cpp34
-rw-r--r--engines/avalanche/timeout2.h8
-rw-r--r--engines/avalanche/trip6.h68
-rw-r--r--engines/avalanche/visa2.cpp6
17 files changed, 408 insertions, 375 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 3248629268..b1b5fe880b 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -44,8 +44,6 @@
#include "avalanche/visa2.h"
#include "avalanche/closing2.h"
-/*#include "Incline.h"*/
-
#include "common/str.h"
#include "common/textconsole.h"
#include "common/config-manager.h"
@@ -140,7 +138,7 @@ void Avalot::setup() {
_vm->_gyro->holdthedawn = true;
_vm->_lucerna->dusk();
_vm->_gyro->cmp = 177;
- _vm->_lucerna->mouse_init(); /*on;*/
+ _vm->_lucerna->mouse_init(); // on;
_vm->_gyro->dropsok = true;
_vm->_gyro->ctrl = ckey;
_vm->_gyro->oldjw = 177;
@@ -154,7 +152,7 @@ void Avalot::setup() {
_vm->_parser->_quote = true;
_vm->_gyro->ledstatus = 177;
_vm->_gyro->defaultled = 2;
- /* TSkellern:=0; { Replace with a more local variable sometime }*/
+ // TSkellern = 0; Replace with a more local variable sometime
_vm->_gyro->dna.rw = _vm->_gyro->stopped;
_vm->_gyro->enid_filename = ""; // Undefined.
_vm->_lucerna->toolbar();
@@ -214,16 +212,17 @@ void Avalot::run(Common::String arg) {
+#ifdef DEBUG
// ONLY FOR TESTING!!!
- /*for (byte i = 0; i < _vm->_gyro->lineNum; i++)
- _vm->_graphics->_surface.drawLine(_vm->_gyro->lines[i].x1, _vm->_gyro->lines[i].y1, _vm->_gyro->lines[i].x2, _vm->_gyro->lines[i].y2, _vm->_gyro->lines[i].col);
+ for (byte i = 0; i < _vm->_gyro->lineNum; i++)
+ _vm->_graphics->_surface.drawLine(_vm->_gyro->lines[i].x1, _vm->_gyro->lines[i].y1, _vm->_gyro->lines[i].x2, _vm->_gyro->lines[i].y2, _vm->_gyro->lines[i].col);
for (byte i = 0; i < _vm->_gyro->numfields; i++) {
- if (_vm->_gyro->fields[i].x1 < 640)
- _vm->_graphics->_surface.frameRect(Common::Rect(_vm->_gyro->fields[i].x1, _vm->_gyro->fields[i].y1, _vm->_gyro->fields[i].x2, _vm->_gyro->fields[i].y2), lightmagenta);
- }*/
- // ONYL FOR TESTING!!!
-
+ if (_vm->_gyro->fields[i].x1 < 640)
+ _vm->_graphics->_surface.frameRect(Common::Rect(_vm->_gyro->fields[i].x1, _vm->_gyro->fields[i].y1, _vm->_gyro->fields[i].x2, _vm->_gyro->fields[i].y2), lightmagenta);
+ }
+ // ONLY FOR TESTING!!!
+#endif
_vm->_graphics->refreshScreen(); // TODO: Maybe it'll have a better place later. Move it there when it's needed.
diff --git a/engines/avalanche/celer2.h b/engines/avalanche/celer2.h
index fe38ebe917..a4cd0eb675 100644
--- a/engines/avalanche/celer2.h
+++ b/engines/avalanche/celer2.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 memos[fv].x when it's not in memory.
void drawSprite(int16 x, int16 y, const SpriteType &sprite);
};
diff --git a/engines/avalanche/enid2.cpp b/engines/avalanche/enid2.cpp
index 7a257d04f5..4477fe7332 100644
--- a/engines/avalanche/enid2.cpp
+++ b/engines/avalanche/enid2.cpp
@@ -54,14 +54,14 @@ const char Enid::tab = '\t';
const char Enid::eof_ = '\n';
const Common::String Enid::ednafirst =
- Common::String("This is an EDNA-based file, saved by a Thorsoft game. Good luck!") + /*64*/
- crlf + eof_ + crlf + crlf + /*7*/
- tab + "Glory to God in the highest," + crlf + /*31*/
- tab + "and on earth peace, goodwill toward men." + /*42*/
- crlf + tab + tab + tab + tab + /*6*/
- "Luke 2:14." + /*10*/
- crlf + crlf + crlf + /* 6 */
- "1234567890" +crlf; /*11*/
+ Common::String("This is an EDNA-based file, saved by a Thorsoft game. Good luck!") + // 64
+ crlf + eof_ + crlf + crlf + // 7
+ tab + "Glory to God in the highest," + crlf + // 31
+ tab + "and on earth peace, goodwill toward men." + // 42
+ crlf + tab + tab + tab + tab + // 6
+ "Luke 2:14." + // 10
+ crlf + crlf + crlf + // 6
+ "1234567890" +crlf; // 11
const Common::String Enid::ednaid = Common::String("TT") + char(261) + char(60) + char(1) + char(165) + char(261) + char(231) + char(261);
@@ -165,17 +165,19 @@ void Enid::showheader() {
_vm->_scrolls->display(Common::String("Dir: ") + path + "\r\r\4");
}
-void Enid::dir(Common::String where) { /* OK, it worked in Avaricius, let's do it in Avalot! */
+void Enid::dir(Common::String where) { // OK, it worked in Avaricius, let's do it in Avalot!
warning("STUB: Enid::dir()");
}
-void Enid::avvy_background() { /* Not really a filing procedure,
- but it's only called just before edna_load, so I thought I'd put it
- in Enid instead of, say, Lucerna. */
+void Enid::avvy_background() {
+ // Not really a filing procedure,
+ // but it's only called just before edna_load, so I thought I'd put it
+ // in Enid instead of, say, Lucerna.
- /* port[$3c4]:=2; port[$3ce]:=4; port[$3C5]:=1; port[$3CF]:=1; { Blue. }*/
- /*
- asm
+#if 0
+ port[$3c4]:=2; port[$3ce]:=4; port[$3C5]:=1; port[$3CF]:=1; { Blue. }
+
+ asm
mov dx,$3c4; mov al,2; out dx,al; { Set up the VGA to use the "blue" }
mov dx,$3ce; mov al,4; out dx,al; { register. }
mov dx,$3c5; mov al,1; out dx,al;
@@ -246,7 +248,7 @@ void Enid::avvy_background() { /* Not really a filing procedure,
@the_end:
end;
- */
+#endif
}
void Enid::to_sundry(sundry &sund) {
@@ -274,8 +276,8 @@ void Enid::edna_reload() {
restore_dna();
- _vm->_gyro->seescroll = true; /* This prevents display of the new sprites before the
- new picture is loaded. */
+ _vm->_gyro->seescroll = true; // This prevents display of the new sprites before the
+ // new picture is loaded.
_vm->_lucerna->major_redraw();
diff --git a/engines/avalanche/enid2.h b/engines/avalanche/enid2.h
index 6fac687ac0..2237d352af 100644
--- a/engines/avalanche/enid2.h
+++ b/engines/avalanche/enid2.h
@@ -44,7 +44,7 @@ public:
void edna_load(Common::String name);
- void edna_reload(); /* From Bootstrap's storage. */
+ void edna_reload(); // From Bootstrap's storage.
void dir(Common::String where);
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index 35ccd5ff2e..92bffc2976 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -97,13 +97,13 @@ void Graphics::drawBar(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) {
}
void Graphics::drawSprite(const SpriteInfo &sprite, byte picnum, int16 x, int16 y) {
- /* First we make the pixels of the spirte blank. */
+ // First we make the pixels of the spirte blank.
for (byte j = 0; j < sprite.yl; j++)
for (byte i = 0; i < sprite.xl; i++)
if (((*sprite.sil[picnum])[j][i / 8] >> ((7 - i % 8)) & 1) == 0)
*getPixel(x + i, y + j) = 0;
- /* Then we draw the picture to the blank places. */
+ // Then we draw the picture to the blank places.
uint16 maniPos = 0; // Because the original manitype starts at 5!!! See Graphics.h for definition.
for (byte j = 0; j < sprite.yl; j++)
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index 7f27186bac..4c812fb7de 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -41,17 +41,17 @@ typedef byte fontType[256][16]; // raw font type
typedef byte manitype[2049]; // manitype = array[5..2053] of byte;
// Be aware!!!
-typedef byte siltype[51][11]; /* 35, 4 */
+typedef byte siltype[51][11]; // 35, 4
class SpriteInfo {
public:
- byte xw; /* x-width in bytes */
- byte xl, yl; /* x & y lengths of pictures */
+ byte xw; // x-width in bytes
+ byte xl, yl; // x & y lengths of pictures
manitype *mani[24];
siltype *sil[24];
- uint16 size; /* the size of one picture */
+ uint16 size; // the size of one picture
};
diff --git a/engines/avalanche/gyro2.h b/engines/avalanche/gyro2.h
index d453c77d7f..d70072777e 100644
--- a/engines/avalanche/gyro2.h
+++ b/engines/avalanche/gyro2.h
@@ -60,108 +60,108 @@ struct mp { // mouse-void
};
struct dnatype { // here goes... Ux, uy, & ww now all belong to Trip5
- byte rw; /* Realway- just for convenience! */
- byte carrying; /* how many objects you're carrying... */
- bool obj[numobjs]; /* ...and which ones they are. */
- int16 score; /* your score, of course */
- int32 pence; /* your current amount of dosh */
- byte room; /* your current room */
- byte wearing; /* what you're wearing */
- byte swore; /* number of times you've sworn */
- byte saves; /* number of times this game has been saved */
- byte rooms[100]; /* Add one to each every time you enter a room */
- byte alcohol; /* Your blood alcohol level. */
- byte playednim; /* How many times you've played Nim. */
- bool wonnim; /* Have you *won* Nim? (That's harder.) */
- byte winestate; /* 0=good (Notts), 1=passable(Argent) ... 3=vinegar.*/
- bool cwytalot_gone; /* Has Cwytalot rushed off to Jerusalem yet?*/
+ byte rw; // Realway- just for convenience!
+ byte carrying; // how many objects you're carrying...
+ bool obj[numobjs]; // ...and which ones they are.
+ int16 score; // your score, of course
+ int32 pence; // your current amount of dosh
+ byte room; // your current room
+ byte wearing; // what you're wearing
+ byte swore; // number of times you've sworn
+ byte saves; // number of times this game has been saved
+ byte rooms[100]; // Add one to each every time you enter a room
+ byte alcohol; // Your blood alcohol level.
+ byte playednim; // How many times you've played Nim.
+ bool wonnim; // Have you *won* Nim? (That's harder.)
+ byte winestate; // 0=good (Notts), 1=passable(Argent) ... 3=vinegar.
+ bool cwytalot_gone; // Has Cwytalot rushed off to Jerusalem yet?
- byte pass_num; /* Number of the passw for this game. */
- bool ayles_is_awake; /* pretty obvious! */
- byte drawbridge_open; /* Between 0 (shut) and 4 (open). */
- byte avaricius_talk; /* How much Avaricius has said to you. */
- bool bought_onion; /* Have you bought an onion yet? */
- bool rotten_onion; /* And has it rotted? */
- bool onion_in_vinegar; /* Is the onion in the vinegar? */
+ byte pass_num; // Number of the passw for this game.
+ bool ayles_is_awake; // pretty obvious!
+ byte drawbridge_open; // Between 0 (shut) and 4 (open).
+ byte avaricius_talk; // How much Avaricius has said to you.
+ bool bought_onion; // Have you bought an onion yet?
+ bool rotten_onion; // And has it rotted?
+ bool onion_in_vinegar; // Is the onion in the vinegar?
- byte given2spludwick; /* 0 = nothing given, 1 = onion... */
- byte brummie_stairs; /* Progression through the stairs trick. */
- byte cardiff_things; /* Things you get asked in Cardiff. */
+ byte given2spludwick; // 0 = nothing given, 1 = onion...
+ byte brummie_stairs; // Progression through the stairs trick.
+ byte cardiff_things; // Things you get asked in Cardiff.
- bool cwytalot_in_herts; /* Have you passed Cwytalot in Herts?*/
+ bool cwytalot_in_herts; // Have you passed Cwytalot in Herts?
- bool avvy_is_awake; /* Well? Is Avvy awake? (Screen 1 only.) */
- bool avvy_in_bed; /* True if Avvy's in bed, but awake. */
+ bool avvy_is_awake; // Well? Is Avvy awake? (Screen 1 only.)
+ bool avvy_in_bed; // True if Avvy's in bed, but awake.
- bool user_moves_avvy; /* If this is false, the user has no
- control over Avvy's movements. */
+ bool user_moves_avvy; // If this is false, the user has no
+ // control over Avvy's movements.
- byte dogfoodpos; /* Which way Dogfood's looking in the pub. */
+ byte dogfoodpos; // Which way Dogfood's looking in the pub.
- bool givenbadgetoiby; /* Have you given the badge to Iby yet? */
+ bool givenbadgetoiby; // Have you given the badge to Iby yet?
- bool friar_will_tie_you_up; /* If you're going to get tied up. */
- bool tied_up; /* You ARE tied up! */
+ bool friar_will_tie_you_up; // If you're going to get tied up.
+ bool tied_up; // You ARE tied up!
- byte box_contents; /* 0 = money (sixpence), 254 = empty, any
- other number implies the contents of the box. */
+ byte box_contents; // 0 = money (sixpence), 254 = empty, any
+ // other number implies the contents of the box.
- bool talked_to_crapulus; /* Pretty self-explanatory. */
+ bool talked_to_crapulus; // Pretty self-explanatory.
- byte jacques_awake; /* 0=asleep, 1=awake, 2=gets up, 3=gone. */
+ byte jacques_awake; // 0=asleep, 1=awake, 2=gets up, 3=gone.
- bool ringing_bells; /* Is Jacques ringing the bells? */
+ bool ringing_bells; // Is Jacques ringing the bells?
- bool standing_on_dais; /* In room 71, inside Cardiff Castle. */
- bool taken_pen; /* Have you taken the pen (in Cardiff?) */
- bool arrow_triggered; /* And has the arrow been triggered? */
- bool arrow_in_the_door; /* Did the arrow hit the wall? */
+ bool standing_on_dais; // In room 71, inside Cardiff Castle.
+ bool taken_pen; // Have you taken the pen (in Cardiff?)
+ bool arrow_triggered; // And has the arrow been triggered?
+ bool arrow_in_the_door; // Did the arrow hit the wall?
Common::String like2drink,
favourite_song,
worst_place_on_earth,
- spare_evening; /* Personalisation str's */
+ spare_evening; // Personalisation str's
- uint32 total_time; /* Your total time playing this game, in ticks.*/
+ uint32 total_time; // Your total time playing this game, in ticks.
- byte jumpstatus; /* Fixes how high you're jumping. */
+ byte jumpstatus; // Fixes how high you're jumping.
- bool mushroom_growing; /* Is the mushroom growing in 42? */
+ bool mushroom_growing; // Is the mushroom growing in 42?
- bool spludwicks_here; /* Is Spludwick at home? */
+ bool spludwicks_here; // Is Spludwick at home?
byte last_room;
byte last_room_not_map;
- bool crapulus_will_tell; /* Will Crapulus tell you about
- Spludwick being away? */
+ bool crapulus_will_tell; // Will Crapulus tell you about
+ // Spludwick being away?
bool enter_catacombs_from_lusties_room;
- bool teetotal; /* Are we touching any more drinks? */
- byte malagauche; /* Position of Malagauche. See Celer for more info. */
- char drinking; /* What's he getting you? */
+ bool teetotal; // Are we touching any more drinks?
+ byte malagauche; // Position of Malagauche. See Celer for more info.
+ char drinking; // What's he getting you?
bool entered_lusties_room_as_monk;
- byte cat_x, cat_y; /* XY coords in the catacombs. */
+ byte cat_x, cat_y; // XY coords in the catacombs.
- bool avvys_in_the_cupboard; /* On screen 22. */
+ bool avvys_in_the_cupboard; // On screen 22.
- bool geida_follows; /* Is Geida following you? */
+ bool geida_follows; // Is Geida following you?
- byte geida_spin, geida_time; /* For the making "Geida dizzy" joke. */
+ byte geida_spin, geida_time; // For the making "Geida dizzy" joke.
- byte nextbell; /* For the ringing. */
+ byte nextbell; // For the ringing.
- bool geida_given_potion; /* Does Geida have the potion? */
- bool lustie_is_asleep; /* Is BDL asleep? */
+ bool geida_given_potion; // Does Geida have the potion?
+ bool lustie_is_asleep; // Is BDL asleep?
- byte flip_to_where, flip_to_ped; /* For the sequencer. */
+ byte flip_to_where, flip_to_ped; // For the sequencer.
- bool been_tied_up; /* In r__Robins. */
+ bool been_tied_up; // In r__Robins.
- bool sitting_in_pub; /* Are you sitting down in the pub? */
- byte spurge_talk; /* Count for talking to Spurge. */
+ bool sitting_in_pub; // Are you sitting down in the pub?
+ byte spurge_talk; // Count for talking to Spurge.
bool met_avaroid;
@@ -176,8 +176,8 @@ struct pedtype {
};
struct magictype {
- byte op; /* one of the operations */
- uint16 data; /* data for them */
+ byte op; // one of the operations
+ uint16 data; // data for them
};
class fieldtype {
@@ -198,9 +198,9 @@ enum controllers {cjoy, ckey};
typedef Common::String previoustype[20];
-struct corridor_type { /* Decarations for the corridors. */
- uint16 doors; /* Door styles are calc'ed from this uint16.
- Assign a different number to each one! */
+struct corridor_type { // Decarations for the corridors.
+ uint16 doors; // Door styles are calc'ed from this uint16.
+ // Assign a different number to each one!
};
struct demo_type {
@@ -223,7 +223,7 @@ struct PointType {
int16 x, y;
};
-struct vmctype { /* Virtual Mouse Cursor */
+struct vmctype { // Virtual Mouse Cursor
byte *andpic, *xorpic;
byte *backpic[2];
PointType wherewas[2];
@@ -232,8 +232,7 @@ struct vmctype { /* Virtual Mouse Cursor */
};
struct sundry {
- /* Things which must be saved over a backtobootstrap,
- outside DNA. */
+ // Things which must be saved over a backtobootstrap, outside DNA.
Common::String qenid_filename;
bool qsoundfx;
char qthinks;
@@ -242,38 +241,38 @@ struct sundry {
struct joysetup {
uint16 xmid, ymid, xmin, ymin, xmax, ymax;
- byte centre; /* Size of centre in tenths */
+ byte centre; // Size of centre in tenths
};
-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) */
+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)
};
class Gyro {
@@ -281,10 +280,10 @@ public:
static const char *vernum;
static const char *copyright;
static const int16 thisvercode = 130;
- /* as "vernum", but numerically & without the ".". */
- static const int16 thisgamecode = 2; /* Avalot's code number */
+ // as "vernum", but numerically & without the ".".
+ static const int16 thisgamecode = 2; // Avalot's code number
- /* Objects you can hold: */
+ // Objects you can hold:
static const char wine = 1;
static const char money = 2;
static const char bodkin = 3;
@@ -304,9 +303,9 @@ public:
static const char habit = 17;
static const char onion = 18;
- /* People who hang around this game. */
+ // People who hang around this game.
- /* Boys: */
+ // Boys:
static const uint16 pavalot = 150;
static const uint16 pspludwick = 151;
static const uint16 pcrapulus = 152;
@@ -325,13 +324,13 @@ public:
static const uint16 pspurge = 165;
static const uint16 pjacques = 166;
- /* Girls: */
+ // Girls:
static const uint16 parkata = 175;
static const uint16 pgeida = 176;
static const uint16 pwisewoman = 178;
static const int16 xw = 30;
- static const int16 yw = 36; /* x width & y whatsit */
+ static const int16 yw = 36; // x width & y whatsit
static const int16 margin = 5;
@@ -345,28 +344,28 @@ public:
static const char lasschar[];
- static const int16 numtr = 2; /* current max no. of sprites */
+ static const int16 numtr = 2; // current max no. of sprites
static const bool a_thing = true;
- static const bool a_person = false; /* for Thinkabout */
+ static const bool a_person = false; // for Thinkabout
- /* Magic/portal commands are */
+ // Magic/portal commands are
- /*N*/ static const int16 nix = 0; /* ignore it if this line is touched */
- /*B*/ static const int16 bounces = 1; /* bounce off this line. Not valid for portals. */
- /*E*/ static const int16 exclaim = 2; /* put up a chain of scrolls */
- /*T*/ static const int16 transport = 3; /* enter new room */
- /*U*/ static const int16 unfinished = 4; /* unfinished connection */
- /*S*/ static const int16 special = 5; /* special function. */
- /*O*/ static const int16 mopendoor = 6; /* opening door. */
+ /*N*/ static const int16 nix = 0; // ignore it if this line is touched
+ /*B*/ static const int16 bounces = 1; // bounce off this line. Not valid for portals.
+ /*E*/ static const int16 exclaim = 2; // put up a chain of scrolls
+ /*T*/ static const int16 transport = 3; // enter new room
+ /*U*/ static const int16 unfinished = 4; // unfinished connection
+ /*S*/ static const int16 special = 5; // special function.
+ /*O*/ static const int16 mopendoor = 6; // opening door.
- /* These following static constants should be included in CFG when it's written. */
+ // These following static constants should be included in CFG when it's written.
- static const bool slow_computer = false; /* stops walking when mouse touches toolbar */
+ static const bool slow_computer = false; // stops walking when mouse touches toolbar
/* --- */
- static const int16 border = 1; /* size of border on shadowboxes */
+ static const int16 border = 1; // size of border on shadowboxes
static const int32 pagetop = 81920;
@@ -383,7 +382,7 @@ public:
static const int16 walk = 3;
static const int16 run = 5;
- /* Art gallery at 2,1; notice about this at 2,2. */
+ // Art gallery at 2,1; notice about this at 2,2.
static const int32 catamap[8][8];
@@ -423,7 +422,7 @@ public:
7 = wall with door and candles,
F = straight-through corridor. */
- static const bool demo = false; /* If this is true, we're in a demo of the game. */
+ static const bool demo = false; // If this is true, we're in a demo of the game.
static const char spludwick_order[3];
@@ -438,7 +437,7 @@ public:
static const tunetype tune;
- /* special run-time errors */
+ // special run-time errors
static const int16 runerr_getset_overflow = 50;
@@ -455,28 +454,28 @@ public:
static byte whereis[29];
bool oncandopageswap;
- /* Variable static constant for overriding the ability of On to switch pages.
- * You may know better than On which page to switch to. */
+ // Variable static constant for overriding the ability of On to switch pages.
+ // You may know better than On which page to switch to.
- /* previous:^previoustype;*/
+ // previous:^previoustype;
dnatype dna;
byte lineNum; // Number of lines.
- linetype lines[50]; /* For Also. */
+ linetype lines[50]; // For Also.
int16 c;
//registers r; // http://www.freepascal.org/docs-html/rtl/dos/registers.html
enum { m_no , m_yes , m_virtual } visible;
bool dropsok, screturn, soundfx, cheat;
- uint16 mx, my; /* mouse x & y now */
- uint16 mpx, mpy; /* mouse x & y when pressed */
- uint16 mrx, mry; /* mouse x & y when released */
- byte mpress, mrelease; /* times left mouse button has been pressed/released */
- byte keystatus; /* Mouse key status */
+ uint16 mx, my; // mouse x & y now
+ uint16 mpx, mpy; // mouse x & y when pressed
+ uint16 mrx, mry; // mouse x & y when released
+ byte mpress, mrelease; // times left mouse button has been pressed/released
+ byte keystatus; // Mouse key status
Common::String un[10];
byte unn;
Common::String mousetext;
- /* which:array[0..5] of byte;*/
+ // which:array[0..5] of byte;
void *p;
bool weirdword;
byte to_do;
@@ -486,8 +485,8 @@ public:
byte thinks;
bool thinkthing;
- /* pp:array[1..1000] of postype;
- bb:array[1..9000] of byte;*/
+ // pp:array[1..1000] of postype;
+ // bb:array[1..9000] of byte;
uint16 pptr, bptr;
int16 ppos[1][2];
uint16 pozzes[24];
@@ -495,7 +494,7 @@ public:
void *copier;
int16 talkx, talky;
byte talkb, talkf;
- byte scrollbells; /* no. of times to ring the bell */
+ byte scrollbells; // no. of times to ring the bell
bool ontoolbar, seescroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
char objlist[10];
@@ -506,8 +505,8 @@ public:
byte oldrw;
int8 lastscore[3];
- byte cmp; /* current mouse-void **/
- Common::String verbstr; /* what you can do with your object. :-) */
+ byte cmp; // current mouse-void
+ Common::String verbstr; // what you can do with your object. :-)
Common::String *also[31][2];
pedtype peds[15];
@@ -520,7 +519,7 @@ public:
uint16 oh, onh, om, hour, minutes, seconds;
- Common::String atkey; /* For XTs, set to "alt-". For ATs, set to "f1". */
+ Common::String atkey; // For XTs, set to "alt-". For ATs, set to "f1".
byte cp, ledstatus, defaultled;
fontType characters;
@@ -528,59 +527,58 @@ public:
byte buffer[2000];
uint16 bufsize;
- byte oldjw; /* Old joystick-way */
+ byte oldjw; // Old joystick-way
controllers ctrl;
- int16 underscroll; /* Y-coord of just under the scroll text. */
+ int16 underscroll; // Y-coord of just under the scroll text.
- /* TSkellern is only temporary, and I'll replace it
- with a local version when it's all fixed up. */
+ // TSkellern is only temporary, and I'll replace it
+ // with a local version when it's all fixed up.
- /* tskellern:int32 absolute $0:244; { Over int $61 }*/
+ // tskellern:int32 absolute $0:244; { Over int $61 }
- bool ddmnow; /* Kludge so we don't have to keep referring to Dropdown */
- Common::String roomname; /* Name of this room */
+ bool ddmnow; // Kludge so we don't have to keep referring to Dropdown
+ Common::String roomname; // Name of this room
//text logfile; // http://wiki.freepascal.org/Text
bool log_epson;
bool cl_override;
- byte locks; /*ABSOLUTE $40:$17;*/
+ byte locks; // ABSOLUTE $40:$17;
- Common::String subject; /* What you're talking to them about. */
- byte subjnumber; /* The same thing. */
+ Common::String subject; // What you're talking to them about.
+ byte subjnumber; // The same thing.
- bool keyboardclick; /* Is a keyboard click noise wanted? */
+ bool keyboardclick; // Is a keyboard click noise wanted?
byte him, her, it;
- int32 roomtime; /* Set to 0 when you enter a room, added to in every loop.*/
+ int32 roomtime; // Set to 0 when you enter a room, added to in every loop.
bool after_the_scroll;
- /* For the demo: */
+ // For the demo:
demo_type demo_rec;
Common::File demofile; // of demo_type
Common::DumpFile demofile_save; // uruk added it - first use located in constructor of Basher
- byte last_person; /* Last person to have been selected using the People
- menu. */
+ byte last_person; // Last person to have been selected using the People menu.
- bool doing_sprite_run; /* Only set to True if we're doing a sprite_run
- at this moment. This stops the trippancy system from moving any of the
- sprites. */
+ bool doing_sprite_run; // Only set to True if we're doing a sprite_run
+ // at this moment. This stops the trippancy system
+ // from moving any of the sprites.
vmctype vmc;
Common::String filetoload;
- bool holdthedawn; /* If this is true, calling Dawn will do nothing.
- It's used, for example, at the start, to stop Load from dawning. */
+ bool holdthedawn; // If this is true, calling Dawn will do nothing.
+ // It's used, for example, at the start, to stop Load from dawning.
- uint16 storage_seg, storage_ofs; /* Seg and ofs of the Storage area. */
- uint16 skellern; /* Offset of the timer variable - 1 more than storage_OFS */
+ uint16 storage_seg, storage_ofs; // Seg and ofs of the Storage area.
+ uint16 skellern; // Offset of the timer variable - 1 more than storage_OFS
bool isLoaded; // Is it a loaded gamestate?
- bool super_was_virtual, super_was_off; /* Used by Super_Off and Super_On */
+ bool super_was_virtual, super_was_off; // Used by Super_Off and Super_On
Common::String enid_filename;
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index c5c8062e52..20e83e5639 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -60,10 +60,12 @@ Lucerna::Lucerna(AvalancheEngine *vm) : fxhidden(false) {
void Lucerna::init() {
_vm->_gyro->oh = 17717;
_vm->_gyro->om = 17717;
- /*if (_vm->_enhanced->atbios)
+#if 0
+ if (_vm->_enhanced->atbios)
_vm->_gyro->atkey = "f1";
else
- _vm->_gyro->atkey = "alt-";*/
+ _vm->_gyro->atkey = "alt-";
+#endif
}
void Lucerna::callverb(byte n) {
@@ -210,7 +212,7 @@ void Lucerna::load_also(Common::String n) {
*_vm->_gyro->also[fv][0] = Common::String(',') + *_vm->_gyro->also[fv][0] + ',';
}
-void Lucerna::load(byte n) { /* Load2, actually */
+void Lucerna::load(byte n) { // Load2, actually
Common::String xx;
CursorMan.showMouse(false);
@@ -233,7 +235,7 @@ void Lucerna::load(byte n) { /* Load2, actually */
if ((32 <= actChar) && (actChar <= 126))
_vm->_gyro->roomname += actChar;
}
- /* Compression method byte follows this... */
+ // Compression method byte follows this...
f.seek(177);
@@ -270,17 +272,17 @@ void Lucerna::find_people(byte room) {
void Lucerna::exitroom(byte x) {
//nosound();
_vm->_celer->forgetBackgroundSprites();
- _vm->_gyro->seescroll = true; /* This stops the trippancy system working over the length of this procedure. */
+ _vm->_gyro->seescroll = true; // This stops the trippancy system working over the length of this procedure.
switch (x) {
case r__spludwicks:
_vm->_timeout->lose_timer(_vm->_timeout->reason_avariciustalks);
_vm->_gyro->dna.avaricius_talk = 0;
- /* He doesn't HAVE to be talking for this to work. It just deletes it IF it exists. */
+ // He doesn't HAVE to be talking for this to work. It just deletes it IF it exists.
break;
case r__bridge:
if (_vm->_gyro->dna.drawbridge_open > 0) {
- _vm->_gyro->dna.drawbridge_open = 4; /* Fully open. */
+ _vm->_gyro->dna.drawbridge_open = 4; // Fully open.
_vm->_timeout->lose_timer(_vm->_timeout->reason_drawbridgefalls);
}
break;
@@ -292,24 +294,24 @@ void Lucerna::exitroom(byte x) {
break;
}
- _vm->_gyro->interrogation = 0; /* Leaving the room cancels all the questions automatically. */
+ _vm->_gyro->interrogation = 0; // Leaving the room cancels all the questions automatically.
- _vm->_gyro->seescroll = false; /* Now it can work again! */
+ _vm->_gyro->seescroll = false; // Now it can work again!
_vm->_gyro->dna.last_room = _vm->_gyro->dna.room;
if (_vm->_gyro->dna.room != r__map)
_vm->_gyro->dna.last_room_not_map = _vm->_gyro->dna.room;
}
-void Lucerna::new_town() { /* You've just entered a town from the map. */
+void Lucerna::new_town() { // You've just entered a town from the map.
_vm->_dropdown->setupMenu();
switch (_vm->_gyro->dna.room) {
- case r__outsidenottspub: /* Entry into Nottingham. */
+ case r__outsidenottspub: // Entry into Nottingham.
if ((_vm->_gyro->dna.rooms[r__robins] > 0) && (_vm->_gyro->dna.been_tied_up) && (!_vm->_gyro->dna.taken_mushroom))
_vm->_gyro->dna.mushroom_growing = true;
break;
- case r__wisewomans: { /* Entry into Argent. */
+ case r__wisewomans: { // Entry into Argent.
if (_vm->_gyro->dna.talked_to_crapulus && (! _vm->_gyro->dna.lustie_is_asleep)) {
_vm->_gyro->dna.spludwicks_here = !((_vm->_gyro->dna.rooms[r__wisewomans] % 3) == 1);
_vm->_gyro->dna.crapulus_will_tell = ! _vm->_gyro->dna.spludwicks_here;
@@ -318,14 +320,14 @@ void Lucerna::new_town() { /* You've just entered a town from the map. */
_vm->_gyro->dna.crapulus_will_tell = false;
}
if (_vm->_gyro->dna.box_contents == _vm->_gyro->wine)
- _vm->_gyro->dna.winestate = 3; /* Vinegar */
+ _vm->_gyro->dna.winestate = 3; // Vinegar
}
break;
}
if (_vm->_gyro->dna.room != r__outsideducks) {
if ((_vm->_gyro->dna.obj[_vm->_gyro->onion - 1]) && !(_vm->_gyro->dna.onion_in_vinegar))
- _vm->_gyro->dna.rotten_onion = true; /* You're holding the onion */
+ _vm->_gyro->dna.rotten_onion = true; // You're holding the onion
}
}
@@ -334,14 +336,14 @@ void Lucerna::new_town() { /* You've just entered a town from the map. */
void Lucerna::put_geida_at(byte whichped, byte &ped) {
if (ped == 0)
return;
- _vm->_trip->tr[1].init(5, false, _vm->_trip); /* load Geida */
+ _vm->_trip->tr[1].init(5, false, _vm->_trip); // load Geida
_vm->_trip->apped(2, whichped);
_vm->_trip->tr[1].call_eachstep = true;
_vm->_trip->tr[1].eachstep = _vm->_trip->procgeida_procs;
}
void Lucerna::enterroom(byte x, byte ped) {
- _vm->_gyro->seescroll = true; /* This stops the trippancy system working over the length of this procedure. */
+ _vm->_gyro->seescroll = true; // This stops the trippancy system working over the length of this procedure.
find_people(x);
_vm->_gyro->dna.room = x;
@@ -379,18 +381,18 @@ void Lucerna::enterroom(byte x, byte ped) {
if (! _vm->_gyro->dna.talked_to_crapulus) {
_vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__outsideyours;
- _vm->_trip->tr[1].init(8, false, _vm->_trip); /* load Crapulus */
+ _vm->_trip->tr[1].init(8, false, _vm->_trip); // load Crapulus
if (_vm->_gyro->dna.rooms[r__outsideyours] == 1) {
- _vm->_trip->apped(2, 4); /* Start on the right-hand side of the screen. */
- _vm->_trip->tr[1].walkto(5); /* Walks up to greet you. */
+ _vm->_trip->apped(2, 4); // Start on the right-hand side of the screen.
+ _vm->_trip->tr[1].walkto(5); // Walks up to greet you.
} else {
- _vm->_trip->apped(2, 5); /* Starts where he was before. */
+ _vm->_trip->apped(2, 5); // Starts where he was before.
_vm->_trip->tr[1].face = 3;
}
_vm->_trip->tr[1].call_eachstep = true;
- _vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; /* He always faces Avvy. */
+ _vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; // He always faces Avvy.
} else _vm->_gyro->whereis[_vm->_gyro->pcrapulus - 150] = r__nowhere;
@@ -414,12 +416,12 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__spludwicks:
if (_vm->_gyro->dna.spludwicks_here) {
if (ped > 0) {
- _vm->_trip->tr[1].init(2, false, _vm->_trip); /* load Spludwick */
+ _vm->_trip->tr[1].init(2, false, _vm->_trip); // load Spludwick
_vm->_trip->apped(2, 2);
_vm->_gyro->whereis[1] = r__spludwicks;
}
- _vm->_gyro->dna.dogfoodpos = 0; /* _vm->_gyro->also Spludwick pos. */
+ _vm->_gyro->dna.dogfoodpos = 0; // _vm->_gyro->also Spludwick pos.
_vm->_trip->tr[1].call_eachstep = true;
_vm->_trip->tr[1].eachstep = _vm->_trip->procgeida_procs;
@@ -435,17 +437,17 @@ void Lucerna::enterroom(byte x, byte ped) {
_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__nowhere;
} else {
if (ped > 0) {
- _vm->_trip->tr[1].init(4, false, _vm->_trip); /* 4=Cwytalot*/
+ _vm->_trip->tr[1].init(4, false, _vm->_trip); // 4 = Cwytalot
_vm->_trip->tr[1].call_eachstep = true;
_vm->_trip->tr[1].eachstep = _vm->_trip->procfollow_avvy_y;
_vm->_gyro->whereis[_vm->_gyro->pcwytalot - 150] = r__brummieroad;
- if (_vm->_gyro->dna.rooms[r__brummieroad] == 1) { /* First time here... */
- _vm->_trip->apped(2, 2); /* He appears on the right of the screen... */
- _vm->_trip->tr[1].walkto(4); /* ...and he walks up... */
+ if (_vm->_gyro->dna.rooms[r__brummieroad] == 1) { // First time here...
+ _vm->_trip->apped(2, 2); // He appears on the right of the screen...
+ _vm->_trip->tr[1].walkto(4); // ...and he walks up...
} else {
- /* You've been here before. */
- _vm->_trip->apped(2, 4); /* He's standing in your way straight away... */
+ // You've been here before.
+ _vm->_trip->apped(2, 4); // He's standing in your way straight away...
_vm->_trip->tr[1].face = _vm->_trip->left;
}
}
@@ -456,32 +458,32 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__argentroad: {
if ((_vm->_gyro->dna.cwytalot_gone) && (! _vm->_gyro->dna.cwytalot_in_herts) && (ped == 2) &&
(_vm->_gyro->dna.rooms[r__argentroad] > 3)) {
- _vm->_trip->tr[1].init(4, false, _vm->_trip); /* 4=Cwytalot again*/
+ _vm->_trip->tr[1].init(4, false, _vm->_trip); // 4 = Cwytalot again
_vm->_trip->apped(2, 1);
_vm->_trip->tr[1].walkto(2);
_vm->_trip->tr[1].vanishifstill = true;
_vm->_gyro->dna.cwytalot_in_herts = true;
- /*_vm->_gyro->whereis[#157]:=r__Nowhere;*/ /* can we fit this in? */
+ // _vm->_gyro->whereis[#157] = r__Nowhere; // can we fit this in?
_vm->_timeout->set_up_timer(20, _vm->_timeout->proc_cwytalot_in_herts, _vm->_timeout->reason_cwytalot_in_herts);
}
}
break;
case r__bridge: {
- if (_vm->_gyro->dna.drawbridge_open == 4) { /*open*/
- _vm->_celer->drawBackgroundSprite(-1, -1, 3); /* Position of drawbridge */
+ if (_vm->_gyro->dna.drawbridge_open == 4) { // open
+ _vm->_celer->drawBackgroundSprite(-1, -1, 3); // Position of drawbridge
_vm->_graphics->refreshBackground();
- _vm->_gyro->magics[green - 1].op = _vm->_gyro->nix; /* You may enter the drawbridge. */
+ _vm->_gyro->magics[green - 1].op = _vm->_gyro->nix; // You may enter the drawbridge.
}
if (_vm->_gyro->dna.geida_follows)
- put_geida_at(ped + 3, ped); /* load Geida */
+ put_geida_at(ped + 3, ped); // load Geida
}
break;
case r__robins: {
if (ped > 0) {
if (! _vm->_gyro->dna.been_tied_up) {
- /* A welcome party... or maybe not... */
+ // A welcome party... or maybe not...
_vm->_trip->tr[1].init(6, false, _vm->_trip);
_vm->_trip->apped(2, 2);
_vm->_trip->tr[1].walkto(3);
@@ -506,7 +508,7 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__outsidecardiffcastle: {
if (ped > 0)
switch (_vm->_gyro->dna.cardiff_things) {
- case 0 : { /* You've answered NONE of his questions. */
+ case 0 : { // You've answered NONE of his questions.
_vm->_trip->tr[1].init(9, false, _vm->_trip);
_vm->_trip->apped(2, 2);
_vm->_trip->tr[1].walkto(3);
@@ -515,8 +517,8 @@ void Lucerna::enterroom(byte x, byte ped) {
break;
case 5 :
_vm->_gyro->magics[1].op = _vm->_gyro->nix;
- break; /* You've answered ALL his questions. => nothing happens. */
- default: { /* You've answered SOME of his questions. */
+ break; // You've answered ALL his questions. => nothing happens.
+ default: { // You've answered SOME of his questions.
_vm->_trip->tr[1].init(9, false, _vm->_trip);
_vm->_trip->apped(2, 3);
_vm->_trip->tr[1].face = _vm->_trip->right;
@@ -530,7 +532,7 @@ void Lucerna::enterroom(byte x, byte ped) {
break;
case r__map: {
- /* You're entering the map. */
+ // You're entering the map.
dawn();
//setactivepage(cp);
if (ped > 0)
@@ -539,7 +541,7 @@ void Lucerna::enterroom(byte x, byte ped) {
{
if ((_vm->_gyro->dna.obj[_vm->_gyro->wine - 1]) && (_vm->_gyro->dna.winestate != 3)) {
- _vm->_visa->dixi('q', 9); /* Don't want to waste the wine! */
+ _vm->_visa->dixi('q', 9); // Don't want to waste the wine!
_vm->_gyro->dna.obj[_vm->_gyro->wine - 1] = false;
objectlist();
}
@@ -579,8 +581,8 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__argentpub: {
if (_vm->_gyro->dna.wonnim)
- _vm->_celer->drawBackgroundSprite(-1, -1, 1); /* No lute by the settle. */
- _vm->_gyro->dna.malagauche = 0; /* Ready to boot Malagauche */
+ _vm->_celer->drawBackgroundSprite(-1, -1, 1); // No lute by the settle.
+ _vm->_gyro->dna.malagauche = 0; // Ready to boot Malagauche
if (_vm->_gyro->dna.givenbadgetoiby) {
_vm->_celer->drawBackgroundSprite(-1, -1, 8);
_vm->_celer->drawBackgroundSprite(-1, -1, 9);
@@ -590,11 +592,11 @@ void Lucerna::enterroom(byte x, byte ped) {
break;
case r__lustiesroom: {
- _vm->_gyro->dna.dogfoodpos = 1; /* Actually, du Lustie pos. */
- if (_vm->_trip->tr[0].whichsprite == 0) /* Avvy in his normal clothes */
+ _vm->_gyro->dna.dogfoodpos = 1; // Actually, du Lustie pos.
+ if (_vm->_trip->tr[0].whichsprite == 0) // Avvy in his normal clothes
_vm->_timeout->set_up_timer(3, _vm->_timeout->proccallsguards, _vm->_timeout->reason_du_lustie_talks);
- else if (! _vm->_gyro->dna.entered_lusties_room_as_monk) /*already*/
- /* Presumably, Avvy dressed as a monk. */
+ else if (! _vm->_gyro->dna.entered_lusties_room_as_monk) // already
+ // Presumably, Avvy dressed as a monk.
_vm->_timeout->set_up_timer(3, _vm->_timeout->procgreetsmonk, _vm->_timeout->reason_du_lustie_talks);
if (_vm->_gyro->dna.geida_follows) {
@@ -653,21 +655,21 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__wisewomans: {
_vm->_trip->tr[1].init(11, false, _vm->_trip);
if ((_vm->_gyro->dna.rooms[r__wisewomans] == 1) && (ped > 0)) {
- _vm->_trip->apped(2, 2); /* Start on the right-hand side of the screen. */
- _vm->_trip->tr[1].walkto(4); /* Walks up to greet you. */
+ _vm->_trip->apped(2, 2); // Start on the right-hand side of the screen.
+ _vm->_trip->tr[1].walkto(4); // Walks up to greet you.
} else {
- _vm->_trip->apped(2, 4); /* Starts where she was before. */
+ _vm->_trip->apped(2, 4); // Starts where she was before.
_vm->_trip->tr[1].face = 3;
}
_vm->_trip->tr[1].call_eachstep = true;
- _vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; /* She always faces Avvy. */
+ _vm->_trip->tr[1].eachstep = _vm->_trip->procface_avvy; // She always faces Avvy.
}
break;
case r__insidecardiffcastle:
if (ped > 0) {
- _vm->_trip->tr[1].init(10, false, _vm->_trip); /* Define the dart. */
+ _vm->_trip->tr[1].init(10, false, _vm->_trip); // Define the dart.
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
_vm->_sequence->first_show(1);
@@ -705,11 +707,13 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__insideabbey:
case r__yourhall:
if (ped == 2) {
- /* It was the original:
+#if 0
+ // It was the original:
_vm->_celer->show_one(-1, -1, 2);
_vm->_sequence->first_show(1);
_vm->_sequence->then_show(3);
- _vm->_sequence->start_to_close();*/
+ _vm->_sequence->start_to_close();
+#endif
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
@@ -724,11 +728,11 @@ void Lucerna::enterroom(byte x, byte ped) {
if (_vm->_gyro->dna.ayles_is_awake)
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
- break; /* Ayles awake. */
+ break; // Ayles awake.
case r__geidas:
put_geida_at(2, ped);
- break; /* load Geida */
+ break; // load Geida
case r__easthall:
case r__westhall:
@@ -743,13 +747,13 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__nottspub: {
if (_vm->_gyro->dna.sitting_in_pub) _vm->_celer->drawBackgroundSprite(-1, -1, 3);
- _vm->_gyro->dna.dogfoodpos = 1; /* Actually, du Lustie pos. */
+ _vm->_gyro->dna.dogfoodpos = 1; // Actually, du Lustie pos.
}
break;
case r__outsideducks:
if (ped == 2) {
- /* Shut the door */
+ // Shut the door
_vm->_celer->drawBackgroundSprite(-1, -1, 3);
_vm->_graphics->refreshBackground();
_vm->_sequence->first_show(3);
@@ -762,16 +766,16 @@ void Lucerna::enterroom(byte x, byte ped) {
case r__ducks:
_vm->_gyro->dna.dogfoodpos = 1;
- break; /* Actually, Duck pos. */
+ break; // Actually, Duck pos.
}
- _vm->_gyro->seescroll = false; /* Now it can work again! */
+ _vm->_gyro->seescroll = false; // Now it can work again!
if (_vm->_gyro->isLoaded)
_vm->_gyro->isLoaded = false;
}
-void Lucerna::thinkabout(byte z, bool th) { /* Hey!!! Get it and put it!!! */
+void Lucerna::thinkabout(byte z, bool th) { // Hey!!! Get it and put it!!!
const int16 picsize = 966;
const bytefield thinkspace = {25, 170, 32, 200};
@@ -795,7 +799,7 @@ void Lucerna::thinkabout(byte z, bool th) { /* Hey!!! Get it and put it!!! *
if (z >= 25)
z -= 8;
if (z == 20)
- z--; /* Last time... */
+ z--; // Last time...
}
@@ -811,9 +815,11 @@ void Lucerna::thinkabout(byte z, bool th) { /* Hey!!! Get it and put it!!! *
CursorMan.showMouse(false);
- /*setactivepage(3);
+#if 0
+ setactivepage(3);
putimage(x, y, p, 0);
- setactivepage(1 - cp);*/
+ setactivepage(1 - cp);
+#endif
for (byte fv = 0; fv <= 1; fv++)
_vm->_trip->getset[fv].remember(thinkspace);
@@ -822,7 +828,7 @@ void Lucerna::thinkabout(byte z, bool th) { /* Hey!!! Get it and put it!!! *
_vm->_gyro->thinkthing = th;
}
-void Lucerna::load_digits() { /* Load the scoring digits & rwlites */
+void Lucerna::load_digits() { // Load the scoring digits & rwlites
const byte digitsize = 134;
const byte rwlitesize = 126;
@@ -833,15 +839,23 @@ void Lucerna::load_digits() { /* Load the scoring digits & rwlites */
for (byte fv = 0; fv < 10; fv++) {
f.seek(fv * digitsize);
- /*_vm->_gyro->digit[fv] = new byte[digitsize];
- f.read(_vm->_gyro->digit[fv], digitsize);*/
+
+#if 0
+ _vm->_gyro->digit[fv] = new byte[digitsize];
+ f.read(_vm->_gyro->digit[fv], digitsize);
+#endif
+
_vm->_gyro->digit[fv] = _vm->_graphics->loadPictureGraphic(f);
}
for (byte ff = 0; ff < 9; ff++) {
f.seek(10 * digitsize + ff * rwlitesize);
- /*_vm->_gyro->rwlite[ff] = new byte[rwlitesize];
- f.read(_vm->_gyro->rwlite[ff], rwlitesize);*/
+
+#if 0
+ _vm->_gyro->rwlite[ff] = new byte[rwlitesize];
+ f.read(_vm->_gyro->rwlite[ff], rwlitesize);
+#endif
+
_vm->_gyro->rwlite[ff] = _vm->_graphics->loadPictureGraphic(f);
}
@@ -856,7 +870,7 @@ void Lucerna::toolbar() {
f.seek(40);
- /* off;*/
+ // off;
::Graphics::Surface picture = _vm->_graphics->loadPictureGraphic(f);
@@ -866,7 +880,7 @@ void Lucerna::toolbar() {
f.close();
- /* on;*/
+ // on;
_vm->_gyro->oldrw = 177;
showrw();
@@ -908,13 +922,17 @@ void Lucerna::showscore() {
_vm->_gyro->lastscore[i] = numbers[i];
}
-void Lucerna::points(byte num) { /* Add on no. of points */
+void Lucerna::points(byte num) { // Add on no. of points
for (byte q = 1; q <= num; q++) {
_vm->_gyro->dna.score++;
- /*if (soundfx)
+
+#if 0
+ if (soundfx) {
for (byte fv = 1; fv <= 97; fv++)
sound(177 + dna.score * 3);
- nosound;*/
+ }
+ nosound;
+#endif
}
warning("STUB: Lucerna::points()");
@@ -975,7 +993,7 @@ void Lucerna::fxtoggle() {
void Lucerna::objectlist() {
_vm->_gyro->dna.carrying = 0;
if (_vm->_gyro->thinkthing && !_vm->_gyro->dna.obj[_vm->_gyro->thinks - 1])
- thinkabout(_vm->_gyro->money, _vm->_gyro->a_thing); /* you always have money */
+ thinkabout(_vm->_gyro->money, _vm->_gyro->a_thing); // you always have money
for (byte fv = 0; fv < numobjs; fv++)
if (_vm->_gyro->dna.obj[fv]) {
_vm->_gyro->dna.carrying++;
@@ -1133,7 +1151,7 @@ int8 Lucerna::fades(int8 x) {
b--;
return (16 * r + 4 * g + b);
- /* fades:=x-1;*/
+ // fades = x - 1;
}
@@ -1166,10 +1184,12 @@ void Lucerna::showrw() { // It's data is loaded in load_digits().
_vm->_gyro->oldrw = _vm->_gyro->dna.rw;
CursorMan.showMouse(false);
- /* for (byte page_ = 0; page_ <= 1; page_++) {
- setactivepage(page_);
- putimage(0, 161, rwlite[with.rw], 0);
- }*/
+#if 0
+ for (byte page_ = 0; page_ <= 1; page_++) {
+ setactivepage(page_);
+ putimage(0, 161, rwlite[with.rw], 0);
+ }
+#endif
_vm->_graphics->drawPicture(_vm->_graphics->_surface, _vm->_gyro->rwlite[_vm->_gyro->dna.rw], 0, 161);
@@ -1208,7 +1228,7 @@ void Lucerna::refresh_hands() {
}
void Lucerna::plothands() {
- /* off;*/
+ // off;
//setactivepage(3);
calchand(_vm->_gyro->onh, 14, ah, yellow);
calchand(_vm->_gyro->om * 6, 17, am, yellow);
@@ -1224,7 +1244,7 @@ void Lucerna::plothands() {
refresh_hands();
- /* on;*/
+ // on;
}
void Lucerna::chime() {
@@ -1232,7 +1252,7 @@ void Lucerna::chime() {
}
void Lucerna::clock_lucerna() {
- /* ...Clock. */
+ // ...Clock.
TimeDate t;
_vm->_system->getTimeAndDate(t);
_vm->_gyro->hour = t.tm_hour;
@@ -1291,7 +1311,7 @@ void Lucerna::gameover() {
void Lucerna::minor_redraw() {
dusk();
- enterroom(_vm->_gyro->dna.room, 0); /* Ped unknown or non-existant. */
+ enterroom(_vm->_gyro->dna.room, 0); // Ped unknown or non-existant.
for (byte fv = 0; fv <= 1; fv++) {
_vm->_gyro->cp = 1 - _vm->_gyro->cp;
@@ -1299,7 +1319,7 @@ void Lucerna::minor_redraw() {
}
for (byte i = 0; i < 3; i++)
- _vm->_gyro->lastscore[i] = -1; /* impossible digits */
+ _vm->_gyro->lastscore[i] = -1; // impossible digits
showscore();
dawn();
@@ -1312,17 +1332,19 @@ void Lucerna::major_redraw() {
uint16 Lucerna::bearing(byte whichped) {
whichped--; // Different array indexes in Pascal and C.
- const double rad2deg = 180 / 3.14 /*Pi*/;
+ const double rad2deg = 180 / 3.14; // Pi
if (_vm->_trip->tr[0].x == _vm->_gyro->peds[whichped].x)
return 0;
- else
- if (_vm->_trip->tr[0].x < _vm->_gyro->peds[whichped].x)
+ else {
+ if (_vm->_trip->tr[0].x < _vm->_gyro->peds[whichped].x) {
return (atan(double((_vm->_trip->tr[0].y - _vm->_gyro->peds[whichped].y))
/ (_vm->_trip->tr[0].x - _vm->_gyro->peds[whichped].x)) * rad2deg) + 90;
- else
+ } else {
return (atan(double((_vm->_trip->tr[0].y - _vm->_gyro->peds[whichped].y))
/ (_vm->_trip->tr[0].x - _vm->_gyro->peds[whichped].x)) * rad2deg) + 270;
+ }
+ }
}
void Lucerna::sprite_run() {
diff --git a/engines/avalanche/lucerna2.h b/engines/avalanche/lucerna2.h
index f20b0d01d6..d3e1becbdd 100644
--- a/engines/avalanche/lucerna2.h
+++ b/engines/avalanche/lucerna2.h
@@ -60,15 +60,15 @@ public:
void enterroom(byte x, byte ped);
- void thinkabout(byte z, bool th); /* Hey!!! Get it and put it!!! */
+ void thinkabout(byte z, bool th); // Hey!!! Get it and put it!!!
- void load_digits(); /* Load the scoring digits & rwlites */
+ void load_digits(); // Load the scoring digits & rwlites
void toolbar();
void showscore();
- void points(byte num); /* Add on no. of points */
+ void points(byte num); // Add on no. of points
void mouseway(const Common::Point &cursorPos);
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 6ccacc005f..737bf87088 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -44,9 +44,9 @@ void Parser::init() {
void Parser::handleInputText(const Common::Event &event) {
byte inChar = event.kbd.ascii;
warning("STUB: Parser::handleInputText()");
- /*if (_vm->_dropdown->_activeMenuItem._activeNow) {
- _vm->_dropdown->parseKey(inChar, _vm->_enhanced->extd);
- } else {*/
+// if (_vm->_dropdown->_activeMenuItem._activeNow) {
+// _vm->_dropdown->parseKey(inChar, _vm->_enhanced->extd);
+// } else {
if (_inputText.size() < 76) {
if ((inChar == '"') || (inChar == '`')) {
if (_quote)
@@ -61,7 +61,7 @@ void Parser::handleInputText(const Common::Event &event) {
plotText();
} else
_vm->_gyro->blip();
- //}
+// }
}
void Parser::handleBackspace() {
diff --git a/engines/avalanche/pingo2.cpp b/engines/avalanche/pingo2.cpp
index 777a1c7cb6..cc9592b623 100644
--- a/engines/avalanche/pingo2.cpp
+++ b/engines/avalanche/pingo2.cpp
@@ -49,7 +49,8 @@ void Pingo::dplot(int16 x, int16 y, Common::String z) {
}
void Pingo::bosskey() {
-/*const
+#if 0
+const
months : array[0..11] of char = 'JFMAMJJASOND';
title = 'Net Profits';
fish = #224; { à }
@@ -78,20 +79,21 @@ begin;
dawn; on; setbkcolor(1); repeat check until (mpress>0) or keypressed;
while keypressed do r:=readkey; setbkcolor(0); settextjustify(0,0);
dusk; setvisualpage(0); setactivepage(0); mousepage(0); dawn;
- copy02;*/
+ copy02;
+#endif
warning("STUB: Pingo::bosskey()");
}
-void Pingo::copy02() { /* taken from Wobble (below) */
+void Pingo::copy02() { // taken from Wobble (below)
warning("STUB: Pingo::copy02()");
}
-void Pingo::copy03() { /* taken from Wobble (below) */
+void Pingo::copy03() { // taken from Wobble (below)
warning("STUB: Pingo::copy03()");
}
-void Pingo::copypage(byte frp, byte top) { /* taken from Copy02 (above) */
+void Pingo::copypage(byte frp, byte top) { // taken from Copy02 (above)
warning("STUB: Pingo::copypage()");
}
@@ -116,13 +118,16 @@ void Pingo::winning_pic() {
return;
}
- /*for (byte bit = 0; bit <= 3; bit++) {
+#if 0
+ for (byte bit = 0; bit <= 3; bit++) {
port[0x3c4] = 2;
port[0x3ce] = 4;
port[0x3c5] = 1 << bit;
port[0x3cf] = bit;
blockread(f, mem[0xa000 * 0], 16000);
- }*/
+ }
+#endif
+
warning("STUB: Pingo::winning_pic()");
f.close();
@@ -132,12 +137,15 @@ void Pingo::winning_pic() {
_vm->_lucerna->dawn();
- /*do {
+#if 0
+ do {
_vm->_gyro->check();
} while (!(keypressed() || (mrelease > 0)));
while (keypressed())
char r = readkey();
- major_redraw();*/
+ major_redraw();
+#endif
+
warning("STUB: Pingo::winning_pic()");
}
diff --git a/engines/avalanche/scrolls2.h b/engines/avalanche/scrolls2.h
index c16d983a4f..910285c65a 100644
--- a/engines/avalanche/scrolls2.h
+++ b/engines/avalanche/scrolls2.h
@@ -62,7 +62,7 @@ public:
- bool aboutscroll; /* Is this the about box? */
+ bool aboutscroll; // Is this the about box?
@@ -70,9 +70,9 @@ public:
void init();
- void state(byte x); /* Sets "Ready" light to whatever */
+ void state(byte x); // Sets "Ready" light to whatever
- void drawscroll(func2 gotoit); /* This is one of the oldest funcs in the game. */
+ void drawscroll(func2 gotoit); // This is one of the oldest funcs in the game.
void bubble(func2 gotoit);
@@ -88,7 +88,7 @@ public:
Common::String lsd();
- void okay(); /* Says "Okay!" */
+ void okay(); // Says "Okay!"
void musical_scroll();
diff --git a/engines/avalanche/sequence2.cpp b/engines/avalanche/sequence2.cpp
index d5983c8784..315646685a 100644
--- a/engines/avalanche/sequence2.cpp
+++ b/engines/avalanche/sequence2.cpp
@@ -44,11 +44,11 @@ Sequence::Sequence(AvalancheEngine *vm) {
}
void Sequence::first_show(byte what) {
- /* First, we need to blank out the entire array. */
+ // First, we need to blank out the entire array.
for (uint i = 0; i < sizeof(seq); i++)
seq[i] = 0;
- /* Then it's just the same as then_show. */
+ // Then it's just the same as then_show.
then_show(what);
}
@@ -75,16 +75,16 @@ void Sequence::start_to_close() {
}
void Sequence::start_to_open() {
- _vm->_gyro->dna.user_moves_avvy = false; /* They can't move. */
- _vm->_trip->stopwalking(); /* And they're not moving now. */
- start_to_close(); /* Apart from that, it's the same thing. */
+ _vm->_gyro->dna.user_moves_avvy = false; // They can't move.
+ _vm->_trip->stopwalking(); // And they're not moving now.
+ start_to_close(); // Apart from that, it's the same thing.
}
-/* This PROC is called by Timeout when it's time to do another frame. */
+// This PROC is called by Timeout when it's time to do another frame.
void Sequence::shove_left() {
- memcpy(seq, seq+1, seq_length - 1); /* Shift everything to the left. */
+ memcpy(seq, seq+1, seq_length - 1); // Shift everything to the left.
}
void Sequence::call_sequencer() {
@@ -101,12 +101,12 @@ void Sequence::call_sequencer() {
}
if ((seq[0] >= 1) && (seq[0] <= 176)) {
- /* Show a frame. */
+ // Show a frame.
_vm->_celer->drawBackgroundSprite(-1, -1, seq[0]);
shove_left();
}
- start_to_close(); /* Make sure this PROC gets called again. */
+ start_to_close(); // Make sure this PROC gets called again.
}
} // End of namespace Avalanche.
diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp
index 7979a8d09a..3a2271a384 100644
--- a/engines/avalanche/timeout2.cpp
+++ b/engines/avalanche/timeout2.cpp
@@ -345,7 +345,7 @@ void Timeout::after_the_shootemup() {
_vm->_trip->fliproom(_vm->_gyro->dna.room, 0);
// Only placed this here to replace the minigame. TODO: Remove it when the shoot em' up is implemented!
- _vm->_trip->tr[0].init(0, true, _vm->_trip); /* Avalot. */
+ _vm->_trip->tr[0].init(0, true, _vm->_trip); // Avalot.
_vm->_trip->apped(1, 2);
_vm->_gyro->dna.user_moves_avvy = true;
_vm->_gyro->dna.obj[_vm->_gyro->crossbow - 1] = true;
@@ -355,19 +355,21 @@ void Timeout::after_the_shootemup() {
_vm->_scrolls->display(Common::String("P.S.: There should have been the mini-game called \"shoot em' up\", but I haven't implemented it yet: you get the crossbow automatically.")
+ _vm->_scrolls->kControlNewLine + _vm->_scrolls->kControlNewLine + "Peter (uruk)");
- //byte shootscore, gain;
+#if 0
+ byte shootscore, gain;
- //shootscore = mem[storage_seg * storage_ofs];
- //gain = (shootscore + 5) / 10; /* Rounding up. */
+ shootscore = mem[storage_seg * storage_ofs];
+ gain = (shootscore + 5) / 10; // Rounding up.
- //display(string("\6Your score was ") + strf(shootscore) + '.' + "\r\rYou gain (" +
- // strf(shootscore) + " ö 10) = " + strf(gain) + " points.");
+ display(string("\6Your score was ") + strf(shootscore) + '.' + "\r\rYou gain (" +
+ strf(shootscore) + " ö 10) = " + strf(gain) + " points.");
- //if (gain > 20) {
- // display("But we won't let you have more than 20 points!");
- // points(20);
- //} else
- // points(gain);
+ if (gain > 20) {
+ display("But we won't let you have more than 20 points!");
+ points(20);
+ } else
+ points(gain);
+#endif
warning("STUB: Timeout::after_the_shootemup()");
@@ -621,10 +623,12 @@ void Timeout::winning() {
_vm->_pingo->winning_pic();
warning("STUB: Timeout::winning()");
- /*do {
- _vm->_lucerna->checkclick();
- } while (!(_vm->_gyro->mrelease == 0));*/
- // To be implemented with Pingo::winning_pic().
+#if 0
+ do {
+ _vm->_lucerna->checkclick();
+ } while (!(_vm->_gyro->mrelease == 0));
+#endif
+ // TODO: To be implemented with Pingo::winning_pic().
_vm->_lucerna->callverb(_vm->_acci->kVerbCodeScore);
_vm->_scrolls->display(" T H E E N D ");
diff --git a/engines/avalanche/timeout2.h b/engines/avalanche/timeout2.h
index 9ad2c30eb6..2bac5a0031 100644
--- a/engines/avalanche/timeout2.h
+++ b/engines/avalanche/timeout2.h
@@ -37,7 +37,7 @@ class AvalancheEngine;
class Timeout {
public:
- /* reason_ now runs between 1 and 28. */
+ // reason_ now runs between 1 and 28.
static const int16 reason_drawbridgefalls = 2;
static const int16 reason_avariciustalks = 3;
@@ -47,7 +47,7 @@ public:
static const int16 reason_cardiffsurvey = 7;
static const int16 reason_cwytalot_in_herts = 8;
static const int16 reason_getting_tied_up = 9;
- static const int16 reason_hanging_around = 10; /* Tied to the tree in Nottingham. */
+ static const int16 reason_hanging_around = 10; // Tied to the tree in Nottingham.
static const int16 reason_jacques_waking_up = 11;
static const int16 reason_naughty_duke = 12;
static const int16 reason_jumping = 13;
@@ -68,7 +68,7 @@ public:
static const int16 reason_spludwalk = 27;
static const int16 reason_geida_sings = 28;
- /* procx now runs between 1 and 41. */
+ // procx now runs between 1 and 41.
static const int16 procopen_drawbridge = 3;
static const int16 procavaricius_talks = 4;
@@ -103,7 +103,7 @@ public:
static const int16 procrobin_hood_and_geida = 2;
static const int16 procrobin_hood_and_geida_talk = 30;
static const int16 procavalot_returns = 31;
- static const int16 procavvy_sit_down = 33; /* In Nottingham. */
+ static const int16 procavvy_sit_down = 33; // In Nottingham.
static const int16 procghost_room_phew = 34;
static const int16 procarkata_shouts = 35;
static const int16 procwinning = 36;
diff --git a/engines/avalanche/trip6.h b/engines/avalanche/trip6.h
index 1f2b83d009..1c5c6db19a 100644
--- a/engines/avalanche/trip6.h
+++ b/engines/avalanche/trip6.h
@@ -39,13 +39,13 @@
namespace Avalanche {
class AvalancheEngine;
-struct adxtype { /* Second revision of ADX type */
- Common::String name/*[13]*/; /* name of character */ // uruk: Note to self: TRAILING /0 !!! Real size: 12
- Common::String comment/*[17]*/; /* comment */ // uruk: Same here, but 16.
- byte num; /* number of pictures */
- byte seq; /* how many in one stride */
- byte fgc, bgc; /* foreground & background bubble colors */
- byte accinum; /* the number according to Acci (1=Avvy, etc.) */
+struct adxtype { // Second revision of ADX type
+ Common::String name; // [13] name of character // uruk: Note to self: TRAILING /0 !!! Real size: 12
+ Common::String comment; // [17] comment // uruk: Same here, but 16.
+ byte num; // number of pictures
+ byte seq; // how many in one stride
+ byte fgc, bgc; // foreground & background bubble colors
+ byte accinum; // the number according to Acci (1=Avvy, etc.)
};
struct trip_saver_type {
@@ -76,41 +76,41 @@ class triptype {
public:
SpriteInfo _info;
- adxtype a; /* vital statistics */
+ adxtype a; // vital statistics
byte face, step;
- int16 x, y; /* current xy coords */
- int16 ox[2], oy[2]; /* last xy coords */
- int8 ix, iy; /* amount to move sprite by, each step */
+ int16 x, y; // current xy coords
+ int16 ox[2], oy[2]; // last xy coords
+ int8 ix, iy; // amount to move sprite by, each step
byte whichsprite;
bool quick, visible, homing, check_me;
- int16 hx, hy; /* homing x & y coords */
- byte count; /* counts before changing step */
- byte xs, ys; /* x & y speed */
- byte totalnum; /* total number of sprites */
- bool vanishifstill; /* Do we show this sprite if it's still? */
+ int16 hx, hy; // homing x & y coords
+ byte count; // counts before changing step
+ byte xs, ys; // x & y speed
+ byte totalnum; // total number of sprites
+ bool vanishifstill; // Do we show this sprite if it's still?
- bool call_eachstep; /* Do we call the eachstep procedure? */
+ bool call_eachstep; // Do we call the eachstep procedure?
byte eachstep;
void init(byte spritenum, bool do_check, Trip *tr);
- /* loads & sets up the sprite */
- void original(); /* just sets Quick to false */
- void andexor(); /* drops sprite onto screen */
- void turn(byte whichway); /* turns him round */
- void appear(int16 wx, int16 wy, byte wf); /* switches him on */
- void bounce(); /* bounces off walls. */
- void walk(); /* prepares for andexor, etc. */
- void walkto(byte pednum); /* home in on a point */
- void stophoming(); /* self-explanatory */
- void homestep(); /* calculates ix & iy for one homing step */
- void speed(int8 xx, int8 yy); /* sets ix & iy, non-homing, etc */
- void stopwalk(); /* Stops the sprite from moving */
- void chatter(); /* Sets up talk vars */
+ // loads & sets up the sprite
+ void original(); // just sets Quick to false
+ void andexor(); // drops sprite onto screen
+ void turn(byte whichway); // turns him round
+ void appear(int16 wx, int16 wy, byte wf); // switches him on
+ void bounce(); // bounces off walls.
+ void walk(); // prepares for andexor, etc.
+ void walkto(byte pednum); // home in on a point
+ void stophoming(); // self-explanatory
+ void homestep(); // calculates ix & iy for one homing step
+ void speed(int8 xx, int8 yy); // sets ix & iy, non-homing, etc
+ void stopwalk(); // Stops the sprite from moving
+ void chatter(); // Sets up talk vars
void set_up_saver(trip_saver_type &v);
void unload_saver(trip_saver_type v);
- void savedata(Common::File &f); /* Self-explanatory, */
- void loaddata(Common::File &f); /* really. */
+ void savedata(Common::File &f); // Self-explanatory,
+ void loaddata(Common::File &f); // really.
void save_data_to_mem(uint16 &where);
void load_data_from_mem(uint16 &where);
@@ -160,7 +160,7 @@ public:
static const int16 ul = 7;
static const int16 stopped = 8;
- static const int16 numtr = 5; /* current max no. of sprites */
+ static const int16 numtr = 5; // current max no. of sprites
@@ -190,7 +190,7 @@ public:
void call_special(uint16 which);
- void open_the_door(byte whither, byte ped, byte magicnum); /* Handles slidey-open doors. */
+ void open_the_door(byte whither, byte ped, byte magicnum); // Handles slidey-open doors.
void catamove(byte ped);
diff --git a/engines/avalanche/visa2.cpp b/engines/avalanche/visa2.cpp
index 0c005fa23f..1de48fd388 100644
--- a/engines/avalanche/visa2.cpp
+++ b/engines/avalanche/visa2.cpp
@@ -112,7 +112,7 @@ void Visa::speech(byte who, byte subject) {
uint16 idx_offset, sez_offset, next_idx_offset;
if (subject == 0) {
- /* No subject. */
+ // No subject.
bubbling = true;
report_dixi_errors = false;
@@ -120,9 +120,9 @@ void Visa::speech(byte who, byte subject) {
bubbling = false;
report_dixi_errors = true;
} else {
- /* Subject given. */
+ // Subject given.
- went_ok = false; /* Assume that until we know otherwise. */
+ went_ok = false; // Assume that until we know otherwise.
if (!indexfile.open("converse.avd")) {
warning("AVALANCHE: Visa: File not found: converse.avd");
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 16:19:22 +0000