rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 20:52:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

no message

Browse source
This commit is contained in:
Andrei Drexler 2004-03-12 11:28:28 +00:00
parent c9f307554d
commit 67b5a58e01
6 changed files with 170 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
reaction/ta_ui/ta_ui.ncb
View file

Binary file not shown.

BIN
reaction/ta_ui/ta_ui.opt
View file

Binary file not shown.

80
reaction/ta_ui/ta_ui.plg
View file

@ -6,46 +6,64 @@
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP978.tmp" with contents
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BD.tmp" with contents
[
/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"Release_TA/" /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"
/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/ta_ui.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c
"D:\Work\rq3source\reaction\game\bg_misc.c"
"D:\Work\rq3source\reaction\game\q_math.c"
"D:\Work\rq3source\reaction\game\q_shared.c"
"D:\Work\rq3source\reaction\ta_ui\ui_atoms.c"
"D:\Work\rq3source\reaction\ta_ui\ui_gameinfo.c"
"D:\Work\rq3source\reaction\ta_ui\ui_main.c"
"D:\Work\rq3source\reaction\ta_ui\ui_players.c"
"D:\Work\rq3source\reaction\ta_ui\ui_shared.c"
"D:\Work\rq3source\reaction\ta_ui\ui_syscalls.c"
"D:\Work\rq3source\reaction\ta_ui\ui_util.c"
]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP978.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP979.tmp" with contents
Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BD.tmp"
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BE.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
.\Release_TA\q_math.obj
.\Release_TA\q_shared.obj
.\Release_TA\ui_atoms.obj
.\Release_TA\ui_gameinfo.obj
.\Release_TA\ui_main.obj
.\Release_TA\ui_players.obj
.\Release_TA\ui_shared.obj
.\Release_TA\ui_syscalls.obj
.\Release_TA\ui_util.obj
/nologo /base:"0x40000000" /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/uix86.pdb" /map:"D:\Work\rq3source\reaction\Release/uix86.map" /machine:I386 /def:".\ui.def" /out:"D:\Work\rq3source\reaction\Release\uix86.dll" /implib:"D:\Work\rq3source\reaction\Release/uix86.lib"
\Work\rq3source\reaction\Release\bg_misc.obj
\Work\rq3source\reaction\Release\q_math.obj
\Work\rq3source\reaction\Release\q_shared.obj
\Work\rq3source\reaction\Release\ui_atoms.obj
\Work\rq3source\reaction\Release\ui_gameinfo.obj
\Work\rq3source\reaction\Release\ui_main.obj
\Work\rq3source\reaction\Release\ui_players.obj
\Work\rq3source\reaction\Release\ui_shared.obj
\Work\rq3source\reaction\Release\ui_syscalls.obj
\Work\rq3source\reaction\Release\ui_util.obj
]
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP979.tmp"
Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BE.tmp"
<h3>Output Window</h3>
Compiling...
bg_misc.c
q_math.c
q_shared.c
ui_atoms.c
ui_gameinfo.c
ui_main.c
ui_players.c
ui_shared.c
ui_syscalls.c
ui_util.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP97D.tmp" with contents
Creating library D:\Work\rq3source\reaction\Release/uix86.lib and object D:\Work\rq3source\reaction\Release/uix86.exp
Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4C2.tmp" with contents
[
/nologo /o"Release_TA/ta_ui.bsc"
.\Release_TA\bg_misc.sbr
.\Release_TA\q_math.sbr
.\Release_TA\q_shared.sbr
.\Release_TA\ui_atoms.sbr
.\Release_TA\ui_gameinfo.sbr
.\Release_TA\ui_main.sbr
.\Release_TA\ui_players.sbr
.\Release_TA\ui_shared.sbr
.\Release_TA\ui_syscalls.sbr
.\Release_TA\ui_util.sbr]
Creating command line "bscmake.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP97D.tmp"
/nologo /o"D:\Work\rq3source\reaction\Release/ta_ui.bsc"
\Work\rq3source\reaction\Release\bg_misc.sbr
\Work\rq3source\reaction\Release\q_math.sbr
\Work\rq3source\reaction\Release\q_shared.sbr
\Work\rq3source\reaction\Release\ui_atoms.sbr
\Work\rq3source\reaction\Release\ui_gameinfo.sbr
\Work\rq3source\reaction\Release\ui_main.sbr
\Work\rq3source\reaction\Release\ui_players.sbr
\Work\rq3source\reaction\Release\ui_shared.sbr
\Work\rq3source\reaction\Release\ui_syscalls.sbr
\Work\rq3source\reaction\Release\ui_util.sbr]
Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4C2.tmp"
Creating browse info file...
<h3>Output Window</h3>

10
reaction/ta_ui/ui_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.80 2004/03/12 11:26:05 makro
// no message
//
// Revision 1.79 2004/01/26 21:26:09 makro
// no message
//
@ -7507,6 +7510,13 @@ void _UI_SetActiveMenu(uiMenuCommand_t menu)
} else {
trap_Cvar_Set("com_errorMessage", "");
}
//Makro - check com_hunkmegs
} else {
if ((int)trap_Cvar_VariableValue("com_hunkMegs") < 96)
{
trap_Cvar_SetValue("com_hunkMegs", 96);
Menus_ActivateByName("memory_popmenu");
};
}
return;
case UIMENU_TEAM:

109
reaction/uifiles/memory.menu Normal file
View file

@ -0,0 +1,109 @@
#include "ui/menudef.h"
{
menuDef {
name "memory_popmenu"
visible 0
fullscreen 0
outOfBoundsClick // this closes the window if it gets a click out of the rectangle
rect 210 124 220 192
focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items
style WINDOW_STYLE_EMPTY
shadowStyle 1
border 0
onOpen { play "sound/misc/menu1.wav" }
onClose { uiScript clearError }
onESC { close memory_popmenu ; open main }
popup
//Window
itemdef {
rect 0 0 220 192
style WINDOW_STYLE_FILLED
backcolor Ig_Window_Color
visible 1
border 1
bordersize 1
bordercolor Ig_Window_BorderColor
decoration
}
//Title
itemdef {
rect 101 1 120 24
style WINDOW_STYLE_SHADER
background "ui/assets/rq3-ingame-title"
visible 1
decoration
}
itemdef {
rect 101 1 120 24
style WINDOW_STYLE_EMPTY
forecolor Ig_Window_TitleColor
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .225
textalign ITEM_ALIGN_LEFT
textalignx 24
textaligny 16
text "Warning"
visible 1
decoration
}
//Error info
itemdef {
name errorinfo
rect 12 40 196 120
style WINDOW_STYLE_FILLED
backcolor 0 0 0 .65
border 1
bordersize 1
bordercolor .5 .5 .5 1
visible 1
decoration
}
itemdef {
name errorinfo
rect 20 44 180 112
type ITEM_TYPE_TEXT
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_SHADOWED
autowrapped
text "Your memory settings are too\n"
"low. You need to restart\n"
"Reaction in order to correct\n"
"this problem."
textalign ITEM_ALIGN_CENTER
textalignx 90
textaligny 16
textscale .225
forecolor 1 1 1 1
visible 1
decoration
}
//Ok
itemdef {
name close
rect 80 168 60 16
style WINDOW_STYLE_EMPTY
type ITEM_TYPE_BUTTON
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .225
textalign ITEM_ALIGN_CENTER
textalignx 30
textaligny 12
text "Ok"
shortcutKey "O"
visible 1
action { uiScript "quit" }
}
}
}

2
reaction/uifiles/menus.txt
View file

@ -33,6 +33,8 @@
loadMenu { "ui/error.menu" }
loadMenu { "ui/memory.menu" }
loadMenu { "ui/quit.menu" }
}