[Scummvm-cvs-logs] scummvm master -> aa20b8cf42cff774fd8d4031a85a4288895ae496
tramboi
bertrand_augereau at yahoo.fr
Sat Nov 26 15:30:27 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aa20b8cf42 DREAMWEB: 'showseconduse' ported to C++
Commit: aa20b8cf42cff774fd8d4031a85a4288895ae496
https://github.com/scummvm/scummvm/commit/aa20b8cf42cff774fd8d4031a85a4288895ae496
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-26T08:29:43-08:00
Commit Message:
DREAMWEB: 'showseconduse' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.h
engines/dreamweb/use.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 6c0a848..320937e 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -287,6 +287,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'disablepath',
'getbackfromob',
'showfirstuse',
+ 'showseconduse',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index e85f62e..89e8ca3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -7782,17 +7782,6 @@ cigarette:
data.byte(kGetback) = 1;
}
-void DreamGenContext::showseconduse() {
- STACK_CHECK;
- getobtextstart();
- nextcolon();
- nextcolon();
- nextcolon();
- usetext();
- cx = 400;
- hangonp();
-}
-
void DreamGenContext::usecardreader1() {
STACK_CHECK;
_cmp(data.byte(kWithobject), 255);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 1f0eb68..89a07bc 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -264,7 +264,6 @@ public:
static const uint16 addr_usecardreader3 = 0xc66c;
static const uint16 addr_usecardreader2 = 0xc668;
static const uint16 addr_usecardreader1 = 0xc664;
- static const uint16 addr_showseconduse = 0xc660;
static const uint16 addr_uselighter = 0xc65c;
static const uint16 addr_usepoolreader = 0xc658;
static const uint16 addr_calledensdlift = 0xc654;
@@ -1437,6 +1436,7 @@ public:
void adjustright();
void putunderzoom();
void vsync();
+ //void showseconduse();
//void finishedwalking();
void findinvpos();
void dumpmenu();
@@ -1547,7 +1547,6 @@ public:
//void getyad();
//void reconstruct();
void soldier1();
- //void animpointer();
void getundercentre();
void checkforexit();
void loadseg();
@@ -1583,7 +1582,7 @@ public:
void getback1();
void setlocation();
void fadefromwhite();
- void checksoundint();
+ //void animpointer();
void usewindow();
void wearshades();
//void onedigit();
@@ -1851,7 +1850,7 @@ public:
//void showryanpage();
//void printlogo();
void allpointer();
- void showseconduse();
+ void checksoundint();
void clearreels();
void malefan();
void dosaveload();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6be62d1..ae26e1f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -341,4 +341,5 @@
void usecharset1();
void getbackfromob();
void showfirstuse();
+ void showseconduse();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 4aeb35f..278767a 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -185,5 +185,14 @@ void DreamGenContext::showfirstuse() {
hangonp(400);
}
+void DreamGenContext::showseconduse() {
+ uint8 *obText = getobtextstartCPP();
+ findnextcolon(&obText);
+ findnextcolon(&obText);
+ findnextcolon(&obText);
+ usetext(obText);
+ hangonp(400);
+}
+
} /*namespace dreamgen */
More information about the Scummvm-git-logs
mailing list