mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-06 18:27:26 +00:00
DREAMWEB: Modified 'showPCX' to allow passing of file name string.
This will allow migration of fixing string values in the cs segment.
This commit is contained in:
parent
cc59b85117
commit
5f992234de
@ -455,6 +455,7 @@ generator = cpp(context, "DreamGen", blacklist = [
|
||||
'showoutermenu',
|
||||
'showouterpad',
|
||||
'showpanel',
|
||||
'showpcx',
|
||||
'showpointer',
|
||||
'showrain',
|
||||
'showreelframe',
|
||||
|
@ -571,7 +571,7 @@ public:
|
||||
void watchReel();
|
||||
void openFileFromC();
|
||||
void getTime();
|
||||
void candles1();
|
||||
void pickupOb();
|
||||
void fadeDOS();
|
||||
void findText1();
|
||||
void isRyanHolding();
|
||||
@ -649,7 +649,6 @@ public:
|
||||
void walkIntoRoom();
|
||||
void useHatch();
|
||||
void printOuterMon();
|
||||
void showPCX();
|
||||
void showDecisions();
|
||||
void removeObFromInv();
|
||||
void useCoveredBox();
|
||||
@ -785,7 +784,7 @@ public:
|
||||
void drawItAll();
|
||||
void useStereo();
|
||||
void candles2();
|
||||
void pickupOb();
|
||||
void candles1();
|
||||
void showOpBox();
|
||||
void clearBeforeLoad();
|
||||
void bibleQuote();
|
||||
|
@ -19,6 +19,9 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*/
|
||||
#ifndef DREAMWEB_STUBS_H
|
||||
#define DREAMWEB_STUBS_H
|
||||
|
||||
void screenUpdate();
|
||||
bool quitRequested();
|
||||
void startup();
|
||||
@ -446,4 +449,7 @@
|
||||
void readKey();
|
||||
void hangOne(uint16 delay);
|
||||
void hangOne();
|
||||
void showPCX(::Common::String name);
|
||||
void showPCX();
|
||||
|
||||
#endif
|
||||
|
@ -219,8 +219,7 @@ static Common::String getFilename(Context &context) {
|
||||
return name;
|
||||
}
|
||||
|
||||
void DreamGenContext::showPCX() {
|
||||
Common::String name = getFilename(*this);
|
||||
void DreamGenContext::showPCX(::Common::String name) {
|
||||
Common::File pcxFile;
|
||||
|
||||
if (!pcxFile.open(name)) {
|
||||
@ -289,6 +288,10 @@ void DreamGenContext::showPCX() {
|
||||
pcxFile.close();
|
||||
}
|
||||
|
||||
void DreamGenContext::showPCX() {
|
||||
showPCX(getFilename(*this));
|
||||
}
|
||||
|
||||
void DreamGenContext::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
|
||||
// NB : These resilience checks were not in the original engine, but did they result in undefined behaviour
|
||||
// or was something broken during porting to C++?
|
||||
|
Loading…
x
Reference in New Issue
Block a user