diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/dreamweb/dreamgen.cpp | 50 | ||||
| -rw-r--r-- | engines/dreamweb/dreamgen.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 5 | ||||
| -rw-r--r-- | engines/dreamweb/vgafades.cpp | 46 | 
4 files changed, 51 insertions, 55 deletions
| diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index dbeab6716a..be706bb32b 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -1772,16 +1772,6 @@ void DreamGenContext::clearPalette() {  	dumpCurrent();  } -void DreamGenContext::fadeScreenUp() { -	STACK_CHECK; -	clearStartPal(); -	palToEndPal(); -	data.byte(kFadedirection) = 1; -	data.byte(kFadecount) = 63; -	data.byte(kColourpos) = 0; -	data.byte(kNumtofade) = 128; -} -  void DreamGenContext::fadeToWhite() {  	STACK_CHECK;  	es = data.word(kBuffers); @@ -1816,16 +1806,6 @@ void DreamGenContext::fadeFromWhite() {  	data.byte(kNumtofade) = 128;  } -void DreamGenContext::fadeScreenUps() { -	STACK_CHECK; -	clearStartPal(); -	palToEndPal(); -	data.byte(kFadedirection) = 1; -	data.byte(kFadecount) = 63; -	data.byte(kColourpos) = 0; -	data.byte(kNumtofade) = 64; -} -  void DreamGenContext::fadeScreenDownHalf() {  	STACK_CHECK;  	palToStartPal(); @@ -1856,36 +1836,6 @@ halfend:  	data.byte(kNumtofade) = 32;  } -void DreamGenContext::fadeScreenUpHalf() { -	STACK_CHECK; -	endPalToStart(); -	palToEndPal(); -	data.byte(kFadedirection) = 1; -	data.byte(kFadecount) = 31; -	data.byte(kColourpos) = 0; -	data.byte(kNumtofade) = 32; -} - -void DreamGenContext::fadeScreenDown() { -	STACK_CHECK; -	palToStartPal(); -	clearEndPal(); -	data.byte(kFadedirection) = 1; -	data.byte(kFadecount) = 63; -	data.byte(kColourpos) = 0; -	data.byte(kNumtofade) = 128; -} - -void DreamGenContext::fadeScreenDowns() { -	STACK_CHECK; -	palToStartPal(); -	clearEndPal(); -	data.byte(kFadedirection) = 1; -	data.byte(kFadecount) = 63; -	data.byte(kColourpos) = 0; -	data.byte(kNumtofade) = 64; -} -  void DreamGenContext::showGun() {  	STACK_CHECK;  	data.byte(kAddtored) = 0; diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h index ac8256aa85..ef8abf96d3 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -640,7 +640,6 @@ public:  	void removeObFromInv();  	void useCoveredBox();  	void openYourNeighbour(); -	void fadeScreenUpHalf();  	void heavy();  	void useKey();  	void lockLightOn(); @@ -730,7 +729,6 @@ public:  	void useWindow();  	void rollEm();  	void delEverything(); -	void fadeScreenDown();  	void poolGuard();  	void openInv();  	void lookAtPlace(); @@ -800,7 +798,6 @@ public:  	void nextDest();  	void makeCaps();  	void read(); -	void fadeScreenUps();  	void hotelControl();  	void mugger();  	void gettingShot(); @@ -834,7 +831,6 @@ public:  	void initialMonCols();  	void checkForShake();  	void useButtonA(); -	void fadeScreenUp();  	void mode640x480();  	void openEden();  	void execCommand(); @@ -859,7 +855,6 @@ public:  	void inToInv();  	void parser();  	void setMouse(); -	void fadeScreenDowns();  	void openHotelDoor2();  	void selectLocation();  	void underTextLine(); diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 310aaaf3be..faa6d9dcae 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -468,5 +468,10 @@  	void realCredits();  	void intro();  	Common::String getFilename(Context &context); +	void fadeScreenUp(); +	void fadeScreenUps(); +	void fadeScreenUpHalf(); +	void fadeScreenDown(); +	void fadeScreenDowns();  #endif diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp index 5b4dd2c8bd..a4f85aad18 100644 --- a/engines/dreamweb/vgafades.cpp +++ b/engines/dreamweb/vgafades.cpp @@ -108,5 +108,51 @@ void DreamGenContext::fadeupMonFirst() {  	hangOn(64);  } +void DreamGenContext::fadeScreenUp() { +	clearStartPal(); +	palToEndPal(); +	data.byte(kFadedirection) = 1; +	data.byte(kFadecount) = 63; +	data.byte(kColourpos) = 0; +	data.byte(kNumtofade) = 128; +} + + +void DreamGenContext::fadeScreenUps() { +	clearStartPal(); +	palToEndPal(); +	data.byte(kFadedirection) = 1; +	data.byte(kFadecount) = 63; +	data.byte(kColourpos) = 0; +	data.byte(kNumtofade) = 64; +} + +void DreamGenContext::fadeScreenUpHalf() { +	endPalToStart(); +	palToEndPal(); +	data.byte(kFadedirection) = 1; +	data.byte(kFadecount) = 31; +	data.byte(kColourpos) = 0; +	data.byte(kNumtofade) = 32; +} + +void DreamGenContext::fadeScreenDown() { +	palToStartPal(); +	clearEndPal(); +	data.byte(kFadedirection) = 1; +	data.byte(kFadecount) = 63; +	data.byte(kColourpos) = 0; +	data.byte(kNumtofade) = 128; +} + +void DreamGenContext::fadeScreenDowns() { +	palToStartPal(); +	clearEndPal(); +	data.byte(kFadedirection) = 1; +	data.byte(kFadecount) = 63; +	data.byte(kColourpos) = 0; +	data.byte(kNumtofade) = 64; +} +  } /*namespace dreamgen */ | 
