Author: esr
Date: Tue Feb 26 23:35:17 2008
New Revision: 24096
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24096&view=rev
Log:
Use the FADE macros just moved into core, rather than hand-rolled
equivalents, in DiD.
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
trunk/data/core/macros/interface-utils.cfg
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg?rev=24096&r1=24095&r2=24096&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
Tue Feb 26 23:35:17 2008
@@ -235,25 +235,7 @@
fire_event=no
[/kill]
- # this is used for fading the screen to black and back
-
-#define FADE_STEP LIGHTNESS DELAY
- [colour_adjust]
- red,green,blue={LIGHTNESS},{LIGHTNESS},{LIGHTNESS}
- [/colour_adjust]
-
- [redraw]
- [/redraw]
-#enddef
-
- {FADE_STEP -32 5}
- {FADE_STEP -64 5}
- {FADE_STEP -96 5}
- {FADE_STEP -128 5}
- {FADE_STEP -160 5}
- {FADE_STEP -192 5}
- {FADE_STEP -224 5}
- {FADE_STEP -255 5}
+ {FADE_TO_BLACK}
[redraw]
[/redraw]
@@ -262,16 +244,7 @@
{DIALOGUE_DID_LICH1}
- {FADE_STEP -224 5}
- {FADE_STEP -192 5}
- {FADE_STEP -160 5}
- {FADE_STEP -128 5}
- {FADE_STEP -96 5}
- {FADE_STEP -64 5}
- {FADE_STEP -32 5}
- {FADE_STEP 0 5}
-
-#undef FADE_STEP
+ {FADE_IN}
# and is reborn as a lich
[unit]
Modified: trunk/data/core/macros/interface-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/interface-utils.cfg?rev=24096&r1=24095&r2=24096&view=diff
==============================================================================
--- trunk/data/core/macros/interface-utils.cfg (original)
+++ trunk/data/core/macros/interface-utils.cfg Tue Feb 26 23:35:17 2008
@@ -486,8 +486,8 @@
#enddef
#The macro that the following fade to black macros rely on
-#define FADE_STEP LIGHTNESS DELAY
- {FADE_STEP_RGB LIGHTNESS LIGHTNESS LIGHTNESS DELAY}
+#define FADE_STEP NUMBER DELAY
+ {FADE_STEP_RGB {NUMBER} {NUMBER} {NUMBER} {DELAY}}
#enddef
#define FADE_TO_BLACK
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
