aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/dropdown.cpp
diff options
context:
space:
mode:
authoruruk2013-06-18 11:50:18 +0200
committeruruk2013-06-18 11:50:18 +0200
commitf974bccbb0071c61521f072ecf803cb40910e8ab (patch)
treedc02d99c06d3b9c11e68f080de2c50b75f03f3ae /engines/avalanche/dropdown.cpp
parent38bc20a0763f0f83ea3c0a94a68a1edea0d08514 (diff)
downloadscummvm-rg350-f974bccbb0071c61521f072ecf803cb40910e8ab.tar.gz
scummvm-rg350-f974bccbb0071c61521f072ecf803cb40910e8ab.tar.bz2
scummvm-rg350-f974bccbb0071c61521f072ecf803cb40910e8ab.zip
AVALANCHE: Remove empty lines with only ";" characters in them.
Diffstat (limited to 'engines/avalanche/dropdown.cpp')
-rw-r--r--engines/avalanche/dropdown.cpp88
1 files changed, 0 insertions, 88 deletions
diff --git a/engines/avalanche/dropdown.cpp b/engines/avalanche/dropdown.cpp
index 0f3d078f12..c5b2c50042 100644
--- a/engines/avalanche/dropdown.cpp
+++ b/engines/avalanche/dropdown.cpp
@@ -72,7 +72,6 @@ char r;
byte fv;
void find_what_you_can_do_with_it() {
- ;
switch (thinks) {
case wine:
case ink:
@@ -107,7 +106,6 @@ void chalk(integer x, integer y, char t, string z, boolean valid) {
byte fv, ff, p, bit;
word pageseg;
byte ander;
- ;
pageseg = 0xa000 + cp * 0x400;
@@ -117,7 +115,6 @@ void chalk(integer x, integer y, char t, string z, boolean valid) {
for (fv = 1; fv <= length(z); fv ++)
for (ff = 0; ff <= 7; ff ++)
for (bit = 0; bit <= 2; bit ++) {
- ;
port[0x3c4] = 2;
port[0x3ce] = 4;
port[0x3c5] = 1 << bit;
@@ -126,7 +123,6 @@ void chalk(integer x, integer y, char t, string z, boolean valid) {
}
for (ff = 0; ff <= 8; ff ++) {
- ;
port[0x3c4] = 2;
port[0x3ce] = 4;
port[0x3c5] = 1 << 3;
@@ -139,7 +135,6 @@ void chalk(integer x, integer y, char t, string z, boolean valid) {
p -= 1;
for (bit = 0; bit <= 2; bit ++) {
- ;
port[0x3c4] = 2;
port[0x3ce] = 4;
port[0x3c5] = 1 << bit;
@@ -156,7 +151,6 @@ void hlchalk(integer x, integer y, char t, string z, boolean valid)
byte fv, ff, p;
word pageseg;
byte ander;
- ;
pageseg = 0xa000 + cp * 0x400;
@@ -183,14 +177,12 @@ begin;
end;*/
void bleep() {
- ;
sound(177);
delay(7);
nosound;
}
void onemenu::start_afresh() {
- ;
number = 0;
width = 0;
firstlix = false;
@@ -199,7 +191,6 @@ void onemenu::start_afresh() {
}
onemenu *onemenu::init() {
- ;
menunow = false;
ddmnow = false;
menunum = 1;
@@ -208,13 +199,11 @@ onemenu *onemenu::init() {
void onemenu::opt(string n, char tr, string key, boolean val) {
integer l;
- ;
number += 1;
l = length(n + key) + 3;
if (width < l) width = l;
{
optiontype &with = oo[number];
- ;
with.title = n;
with.trigger = tr;
with.shortcut = key;
@@ -224,10 +213,8 @@ void onemenu::opt(string n, char tr, string key, boolean val) {
void onemenu::displayopt(byte y, boolean highlit) {
string data;
- ;
{
optiontype &with = oo[y];
- ;
if (highlit)
setfillstyle(1, 0);
@@ -255,7 +242,6 @@ void onemenu::displayopt(byte y, boolean highlit) {
void onemenu::display() {
byte y;
- ;
off();
setactivepage(cp);
setvisualpage(cp);
@@ -284,7 +270,6 @@ void onemenu::display() {
void onemenu::wipe() {
bytefield r;
- ;
setactivepage(cp);
off();
{
@@ -313,9 +298,7 @@ void onemenu::wipe() {
void onemenu::movehighlight(shortint add) {
shortint hn;
- ;
if (add != 0) {
- ;
hn = highlightnum + add;
if ((hn < 0) || (hn >= (unsigned char)number)) return;
highlightnum = hn;
@@ -330,7 +313,6 @@ void onemenu::movehighlight(shortint add) {
}
void onemenu::lightup() { /* This makes the menu highlight follow the mouse.*/
- ;
if ((mx < (cardinal)flx1 * 8) || (mx > (cardinal)flx2 * 8) || (my <= 12) || (my > (cardinal)fly - 3)) return;
highlightnum = (my - 13) / 10;
if (highlightnum == oldy) return;
@@ -338,7 +320,6 @@ void onemenu::lightup() { /* This makes the menu highlight follow the mouse.*/
}
void onemenu::select(byte n) { /* Choose which one you want. */
- ;
if (! oo[n + 1].valid) return;
choicenum = n;
wipe();
@@ -352,13 +333,11 @@ void onemenu::select(byte n) { /* Choose which one you want. */
void onemenu::keystroke(char c) {
byte fv;
boolean found;
- ;
c = upcase(c);
found = false;
for (fv = 1; fv <= number; fv ++) {
optiontype &with = oo[fv];
if ((upcase(with.trigger) == c) && with.valid) {
- ;
select(fv - 1);
found = true;
}
@@ -368,7 +347,6 @@ void onemenu::keystroke(char c) {
headtype *headtype::init
(char trig, char alttrig, string name, byte p, proc dw, proc dc) {
- ;
trigger = trig;
alttrigger = alttrig;
title = name;
@@ -381,21 +359,18 @@ headtype *headtype::init
}
void headtype::display() {
- ;
off(); /*MT*/
chalk(xpos, 1, trigger, title, true);
on(); /*MT*/
}
void headtype::highlight() {
- ;
off();
off_virtual();
nosound;
setactivepage(cp);
hlchalk(xpos, 1, trigger, title, true);
{
- ;
ddm_o.left = xpos;
ddm_o.menunow = true;
ddmnow = true;
@@ -406,9 +381,7 @@ void headtype::highlight() {
boolean headtype::extdparse(char c) {
boolean extdparse_result;
- ;
if (c != alttrigger) {
- ;
extdparse_result = true;
return extdparse_result;
}
@@ -417,13 +390,11 @@ boolean headtype::extdparse(char c) {
}
menuset *menuset::init() {
- ;
howmany = 0;
return this;
}
void menuset::create(char t, string n, char alttrig, proc dw, proc dc) {
- ;
howmany += 1;
ddms[howmany].init(t, alttrig, n, howmany, dw, dc);
}
@@ -431,7 +402,6 @@ void menuset::create(char t, string n, char alttrig, proc dw, proc dc) {
void menuset::update() {
const bytefield menuspace = {0, 0, 80, 9};
byte fv, page_, savecp;
- ;
setactivepage(3);
setfillstyle(1, menu_b);
bar(0, 0, 640, 9);
@@ -449,7 +419,6 @@ void menuset::update() {
void menuset::extd(char c) {
byte fv;
- ;
fv = 1;
while ((fv <= howmany) && (ddms[fv].extdparse(c))) fv += 1;
if (fv > howmany) return;
@@ -457,13 +426,10 @@ void menuset::extd(char c) {
}
void menuset::getcertain(byte fv) {
- ;
{
headtype &with = ddms[fv];
{
- ;
if (ddm_o.menunow) {
- ;
wipe(); /* get rid of menu */
if (ddm_o.menunum == with.position) return; /* clicked on own highlight */
}
@@ -475,12 +441,10 @@ void menuset::getcertain(byte fv) {
void menuset::getmenu(integer x) {
byte fv;
- ;
fv = 0;
do {
fv += 1;
if ((x > ddms[fv].xpos * 8) && (x < ddms[fv].xright * 8)) {
- ;
getcertain(fv);
return;
}
@@ -488,15 +452,12 @@ void menuset::getmenu(integer x) {
}
void parsekey(char r, char re) {
- ;
switch (r) {
case '\0':
case '\340': {
- ;
switch (re) {
case 'K':
if (ddm_o.menunum > 1) {
- ;
wipe();
ddm_m.getcertain(ddm_o.menunum - 1);
} else {
@@ -507,7 +468,6 @@ void parsekey(char r, char re) {
break;
case 'M':
if (ddm_o.menunum < ddm_m.howmany) {
- ;
wipe();
ddm_m.getcertain(ddm_o.menunum + 1);
} else {
@@ -531,7 +491,6 @@ void parsekey(char r, char re) {
select(ddm_o.highlightnum);
break;
default: {
- ;
if (ddm_o.menunow) keystroke(r);
}
}
@@ -540,9 +499,7 @@ void parsekey(char r, char re) {
/*$F+ *** Here follow all the ddm__ and do__ procedures for the DDM system. */
void ddm__game() {
- ;
{
- ;
start_afresh();
opt("Help...", 'H', "f1", true);
opt("Boss Key", 'B', "alt-B", true);
@@ -554,9 +511,7 @@ void ddm__game() {
}
void ddm__file() {
- ;
{
- ;
start_afresh();
opt("New game", 'N', "f4", true);
opt("Load...", 'L', "^f3", true);
@@ -570,11 +525,9 @@ void ddm__file() {
void ddm__action() {
string n;
- ;
n = copy(f5_does(), 2, 255);
{
- ;
start_afresh();
if (n == "")
opt("Do something", 'D', "f5", false);
@@ -598,17 +551,14 @@ void ddm__action() {
void ddm__people() {
byte here;
char fv;
- ;
people = "";
here = dna.room;
{
- ;
start_afresh();
for (fv = '\226'; fv <= '\262'; fv ++)
if (whereis[fv] == here) {
- ;
opt(getname(fv), getnamechar(fv), "", true);
people = people + fv;
}
@@ -618,9 +568,7 @@ void ddm__people() {
void ddm__objects() {
char fv;
- ;
{
- ;
start_afresh();
for (fv = '\1'; fv <= numobjs; fv ++)
if (dna.obj[fv])
@@ -631,7 +579,6 @@ void ddm__objects() {
string himher(char x) { /* Returns "im" for boys, and "er" for girls.*/
string himher_result;
- ;
if (x < '\257') himher_result = "im";
else himher_result = "er";
return himher_result;
@@ -642,18 +589,14 @@ void ddm__with() {
varying_string<7> verb;
char vbchar;
boolean n;
- ;
{
- ;
start_afresh();
if (thinkthing) {
- ;
find_what_you_can_do_with_it();
for (fv = 1; fv <= length(verbstr); fv ++) {
- ;
verbopt(verbstr[fv], verb, vbchar);
opt(verb, vbchar, "", true);
}
@@ -665,13 +608,11 @@ void ddm__with() {
if ((set::of(nowt, pavalot, eos).has(last_person)) ||
(whereis[last_person] != dna.room))
opt("Give to...", 'G', "", false); /* Not here. */ else {
- ;
opt(string("Give to ") + getname(last_person), 'G', "", true);
verbstr = verbstr + vb_give;
}
} else {
- ;
opt("Examine", 'x', "", true);
opt(string("Talk to h") + himher(thinks), 'T', "", true);
verbstr = string(vb_exam) + vb_talk;
@@ -679,21 +620,18 @@ void ddm__with() {
case pgeida:
case parkata: {
- ;
opt("Kiss her", 'K', "", true);
verbstr = verbstr + vb_kiss;
}
break;
case pdogfood: {
- ;
opt("Play his game", 'P', "", ! dna.wonnim); /* True if you HAVEN'T won. */
verbstr = verbstr + vb_play;
}
break;
case pmalagauche: {
- ;
n = ! dna.teetotal;
opt("Buy some wine", 'w', "", ! dna.obj[wine]);
opt("Buy some beer", 'b', "", n);
@@ -705,7 +643,6 @@ void ddm__with() {
break;
case ptrader: {
- ;
opt("Buy an onion", 'o', "", ! dna.obj[onion]);
verbstr = verbstr + '\151';
}
@@ -744,7 +681,6 @@ begin;
end;*/
void do__game() {
- ;
switch (ddm_o.choicenum) {
/* Help, boss, untrash screen. */
case 0:
@@ -766,20 +702,17 @@ void do__game() {
}
void do__file() {
- ;
switch (ddm_o.choicenum) {
/* New game, load, save, save as, DOS shell, about, quit. */
case 0:
callverb(vb_restart);
break;
case 1: {
- ;
realwords[2] = "";
callverb(vb_load);
}
break;
case 2: {
- ;
realwords[2] = "";
callverb(vb_save);
}
@@ -798,7 +731,6 @@ void do__file() {
void do__action() {
string n;
- ;
switch (ddm_o.choicenum) {
/* Get up/pause game/open door/look/inv/walk-run */
case 0: {
@@ -830,22 +762,18 @@ void do__action() {
}
void do__objects() {
- ;
thinkabout(objlist[ddm_o.choicenum + 1], a_thing);
}
void do__people() {
- ;
thinkabout(people[ddm_o.choicenum + 1], a_person);
last_person = people[ddm_o.choicenum + 1];
}
void do__with() {
- ;
thing = thinks;
if (thinkthing) {
- ;
thing += 49;
@@ -855,52 +783,44 @@ void do__with() {
person = '\376';
} else {
- ;
switch (verbstr[ddm_o.choicenum + 1]) {
case '\144': {
- ;
thing = '\144';
callverb(vb_buy);
return;
}
break; /* Beer */
case '\145': {
- ;
thing = '\62';
callverb(vb_buy);
return;
}
break; /* Wine */
case '\146': {
- ;
thing = '\146';
callverb(vb_buy);
return;
}
break; /* Whisky */
case '\147': {
- ;
thing = '\147';
callverb(vb_buy);
return;
}
break; /* Cider */
case '\150': {
- ;
thing = '\153';
callverb(vb_buy);
return;
}
break; /* Mead */
case '\151': {
- ;
thing = '\103';
callverb(vb_buy);
return;
}
break; /* Onion (trader) */
default: {
- ;
person = thing;
thing = '\376';
}
@@ -912,7 +832,6 @@ void do__with() {
/*$F- That's all. Now for the ...bar procs. */
void standard_bar() { /* Standard menu bar */
- ;
ddm_m.init();
ddm_o.init();
{
@@ -941,11 +860,8 @@ begin;
end;*/
void checkclick() { /* only for when the menu's displayed */
- ;
if (mpress > 0) {
- ;
if (mpy > 10) {
- ;
if (!((ddm_o.firstlix) &&
((mpx >= (cardinal)ddm_o.flx1 * 8) && (mpx <= (cardinal)ddm_o.flx2 * 8) &&
(mpy >= 12) && (mpy <= (cardinal)ddm_o.fly)))) {
@@ -959,7 +875,6 @@ void checkclick() { /* only for when the menu's displayed */
} else {
; /* NOT clicked button... */
if (mrelease > 0) {
- ;
if ((ddm_o.firstlix) &&
((mrx >= (cardinal)ddm_o.flx1 * 8) && (mrx <= (cardinal)ddm_o.flx2 * 8) &&
(mry >= 12) && (mry <= (cardinal)ddm_o.fly)))
@@ -969,9 +884,7 @@ void checkclick() { /* only for when the menu's displayed */
}
void menu_link() {
- ;
{
- ;
if (! ddm_o.menunow) return;
check(); /* find mouse coords & click information */
@@ -984,7 +897,6 @@ void menu_link() {
newpointer(1);
break; /* up-arrow */
case 11 ... 169: {
- ;
if ((mx >= (cardinal)ddm_o.flx1 * 8) && (mx <= (cardinal)ddm_o.flx2 * 8) && (my > 10) && (my <= (cardinal)ddm_o.fly))
newpointer(3); /* right-arrow */
else newpointer(4); /* fletch */