rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 07:42:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Items that fade out are hidden automatically now

Browse source
This commit is contained in:
Andrei Drexler 2002-06-04 11:37:23 +00:00
parent 752883bd5b
commit 812fe3e0d5
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/ta_ui/ta_ui.plg
View file

@ -6,13 +6,13 @@
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A0.tmp" with contents
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C1.tmp" with contents
[
/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A0.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A1.tmp" with contents
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C1.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C2.tmp" with contents
[
/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"../Release/uix86.dll" /implib:"Release_TA/uix86.lib"
.\Release_TA\bg_misc.obj
@ -26,10 +26,10 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A1.tmp" with conte
.\Release_TA\ui_syscalls.obj
.\Release_TA\ui_util.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A1.tmp"
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2C2.tmp"
<h3>Output Window</h3>
Compiling...
ui_main.c
ui_shared.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

9
reaction/ta_ui/ui_shared.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.17 2002/06/04 11:37:23 makro
// Items that fade out are hidden automatically now
//
// Revision 1.16 2002/06/02 00:15:07 makro
// Small fixes
//
@ -728,8 +731,14 @@ void UI_RQ3_HandleFading(Window *w) {
w->timeFade.active = qfalse;
if ((w->timeFade.forecolor)) {
UI_RQ3_ColorCopy(w->foreColor, w->timeFade.color2);
//Makro - autohide
if (w->foreColor[3] == 0)
w->flags &= ~WINDOW_VISIBLE;
} else {
UI_RQ3_ColorCopy(w->backColor, w->timeFade.color2);
//Makro - autohide
if (w->backColor[3] == 0)
w->flags &= ~WINDOW_VISIBLE;
}
} else {
if (DC->realTime >= w->timeFade.startTime) {