DREAMWEB: 'showwatch' ported to C++

This commit is contained in:
Bertrand Augereau 2011-11-15 11:05:30 +01:00
parent f028edb491
commit e2ca95c5ad
5 changed files with 12 additions and 20 deletions

View File

@ -205,7 +205,8 @@ generator = cpp(context, "DreamGen", blacklist = [
'wornerror',
'getpersframe',
'convicons',
'examineob'
'examineob',
'showwatch',
], skip_output = [
# These functions are processed but not output
'dreamweb',

View File

@ -14639,20 +14639,6 @@ zoomisoff:
showwatch();
}
void DreamGenContext::showwatch() {
STACK_CHECK;
_cmp(data.byte(kWatchon), 0);
if (flags.z())
return /* (nowristwatch) */;
ds = data.word(kIcons1);
di = 250;
bx = 1;
al = 6;
ah = 0;
showframe();
showtime();
}
void DreamGenContext::zoomicon() {
STACK_CHECK;
_cmp(data.byte(kZoomon), 0);
@ -16875,7 +16861,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
case addr_usetempcharset: usetempcharset(); break;
case addr_showexit: showexit(); break;
case addr_panelicons1: panelicons1(); break;
case addr_showwatch: showwatch(); break;
case addr_gettime: gettime(); break;
case addr_zoomicon: zoomicon(); break;
case addr_worktoscreenm: worktoscreenm(); break;

View File

@ -89,7 +89,6 @@ public:
static const uint16 addr_worktoscreenm = 0xca9c;
static const uint16 addr_zoomicon = 0xca90;
static const uint16 addr_gettime = 0xca8c;
static const uint16 addr_showwatch = 0xca88;
static const uint16 addr_panelicons1 = 0xca84;
static const uint16 addr_showexit = 0xca80;
static const uint16 addr_usetempcharset = 0xca7c;
@ -1262,7 +1261,7 @@ public:
//void frameoutbh();
void getobtextstart();
void loadfolder();
void decide();
void dumpdiarykeys();
//void dumppointer();
void reelsonscreen();
void getridofreels();
@ -1420,7 +1419,7 @@ public:
void getridoftemp2();
void usebalcony();
void runendseq();
void dumpdiarykeys();
void decide();
void disablesoundint();
void priesttext();
//void showallex();
@ -1797,7 +1796,7 @@ public:
void checkinside();
void gates();
void newgame();
void showwatch();
//void showwatch();
//void turnanypathon();
void restorereels();
void setwalk();

View File

@ -1952,6 +1952,12 @@ void DreamGenContext::mainscreen() {
walkandexamine();
}
void DreamGenContext::showwatch() {
if (data.byte(kWatchon)) {
showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 250, 1, 6, 0);
showtime();
}
}
} /*namespace dreamgen */

View File

@ -250,4 +250,5 @@
uint16 getpersframe(uint8 index);
void convicons();
void examineob(bool examineAgain = true);
void showwatch();