[Scummvm-cvs-logs] scummvm master -> 5b5a684c050d937cb8b7284e3d4f17d7746319d0
bluegr
md5 at scummvm.org
Thu Dec 8 09:31:51 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:
5b5a684c05 Merge pull request #128 from fingolfin/dreamweb-segments
Commit: 5b5a684c050d937cb8b7284e3d4f17d7746319d0
https://github.com/scummvm/scummvm/commit/5b5a684c050d937cb8b7284e3d4f17d7746319d0
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-08T00:31:33-08:00
Commit Message:
Merge pull request #128 from fingolfin/dreamweb-segments
DREAMWEB: Refactor segment management
Changed paths:
A engines/dreamweb/segment.h
devtools/tasmrecover/tasm-recover
devtools/tasmrecover/tasm/cpp.py
engines/dreamweb/dreambase.h
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/dreamweb.cpp
engines/dreamweb/print.cpp
engines/dreamweb/runtime.h
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
engines/dreamweb/vgafades.cpp
engines/dreamweb/vgagrafx.cpp
diff --cc engines/dreamweb/dreambase.h
index 6263adf,32d53dc..bad977c
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@@ -81,7 -71,26 +77,25 @@@ public
void dumpBlink();
void dumpPointer();
void showRyanPage();
- void volumeAdjust();
+ // from vgafades.cpp
+ uint8 *mainPalette();
+ uint8 *startPalette();
+ uint8 *endPalette();
+ void clearStartPal();
+ void clearEndPal();
+ void palToStartPal();
+ void endPalToStart();
+ void startPalToEnd();
+ void palToEndPal();
+ void doFade();
+ void fadeCalculation();
+ void fadeScreenUp();
+ void fadeScreenUps();
+ void fadeScreenUpHalf();
+ void fadeScreenDown();
+ void fadeScreenDowns();
+
// from vgagrafx.cpp
uint8 _workspace[(0x1000 + 2) * 16];
inline uint8 *workspace() { return _workspace; }
diff --cc engines/dreamweb/stubs.h
index ea2a74d,3bf4ffa..9e33b02
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@@ -494,16 -479,9 +479,10 @@@
void readKey();
void hangOne(uint16 delay);
void hangOne();
- void showPCX(const Common::String &name);
void bibleQuote();
void realCredits();
+ void runIntroSeq();
void intro();
- void fadeScreenUp();
- void fadeScreenUps();
- void fadeScreenUpHalf();
- void fadeScreenDown();
- void fadeScreenDowns();
void clearBeforeLoad();
void clearReels();
void getRidOfReels();
More information about the Scummvm-git-logs
mailing list