From 0cd2e5b0f2951c5686e2cc1788fd54284ed5dc64 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Thu, 10 Mar 2011 09:23:59 +0000
Subject: [PATCH] Stuff.

---
 reaction/uifiles/options.menu      | 13 +++++--------
 reaction/uifiles/replacements.menu |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/reaction/uifiles/options.menu b/reaction/uifiles/options.menu
index e0ac9492..781826d2 100644
--- a/reaction/uifiles/options.menu
+++ b/reaction/uifiles/options.menu
@@ -40,25 +40,22 @@
 	popup
 	
 	onOOBClick { close _self }
-	onOpen { play "sound/ui/whoosh3.wav" ; uiScript loadControls ;
+	onOpen { play "sound/ui/whoosh3.wav" ; 
 		setitemcolor hints forecolor HINT_COLOR 1 ; hide hints ;
 		ACTIVATE_TAB(1) ;
 	}
-	onClose { uiScript saveControls ; open _prev }
+	onClose { open _prev }
 	onEsc { close _self }
 
 	onOpenSpecial {
 		//normal items
-		setItemColor "fade_alpha" forecolor 5 5 5 0 ;
-		timeFade "fade_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ;
+		ALPHA_FADE_FORE(fade_alpha, 1) ;
 
 		//icon - special alpha
-		setItemColor "icon" forecolor 5 5 5 0 ;
-		timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ;
+		ALPHA_FADE_FORE(icon, ICON_ALPHA) ;
 
 		//line - special alpha; using backcolor
-		setItemColor "line" backcolor 5 5 5 0 ;
-		timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ;
+		ALPHA_FADE_BACK(line, LINE_ALPHA) ;
 	}
 
 
diff --git a/reaction/uifiles/replacements.menu b/reaction/uifiles/replacements.menu
index ce33e606..9a1df329 100644
--- a/reaction/uifiles/replacements.menu
+++ b/reaction/uifiles/replacements.menu
@@ -62,10 +62,11 @@
 		//style WINDOW_STYLE_FILLED
 		//backcolor 0 0 0 1
 		popup
-		onOOBClick { close _self ; open _prev }
+		onOOBClick { close _self }
 		onOpen { play "sound/ui/whoosh3.wav" ; uiScript buildReplacementList 
 			ACTIVATE_TAB(1) ;
 		}
+		onClose { open _prev }
 		onEsc { close _self }
 
 		onOpenSpecial {