mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-23 20:52:16 +00:00
Added an option to change crosshair size in assetGlobalDef's
This commit is contained in:
parent
2847d5a8de
commit
b8180c0ff8
9 changed files with 35 additions and 14 deletions
|
@ -6,7 +6,7 @@
|
|||
--------------------Configuration: ui - Win32 Release TA--------------------
|
||||
</h3>
|
||||
<h3>Command Lines</h3>
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB1.tmp" with contents
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP11D.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_atoms.c"
|
||||
|
@ -16,8 +16,8 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB1.tmp" with conten
|
|||
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
|
||||
"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_syscalls.c"
|
||||
]
|
||||
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB1.tmp"
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB2.tmp" with contents
|
||||
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP11D.tmp"
|
||||
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP11E.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
|
||||
|
@ -31,7 +31,7 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB2.tmp" with conten
|
|||
.\Release_TA\ui_syscalls.obj
|
||||
.\Release_TA\ui_util.obj
|
||||
]
|
||||
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPB2.tmp"
|
||||
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP11E.tmp"
|
||||
<h3>Output Window</h3>
|
||||
Compiling...
|
||||
ui_atoms.c
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.62 2003/02/26 18:22:05 makro
|
||||
// Added an option to change crosshair size in assetGlobalDef's
|
||||
//
|
||||
// Revision 1.61 2003/02/25 22:41:14 jbravo
|
||||
// Fixed a bug in item replacements. Removed "Beta" from the version.
|
||||
//
|
||||
|
@ -910,7 +913,10 @@ void _UI_Refresh(int realtime)
|
|||
// draw cursor
|
||||
UI_SetColor(NULL);
|
||||
if (Menu_Count() > 0) {
|
||||
UI_DrawHandlePic(uiInfo.uiDC.cursorx - 16, uiInfo.uiDC.cursory - 16, 32, 32, uiInfo.uiDC.Assets.cursor);
|
||||
int size = uiInfo.uiDC.cursorSize;
|
||||
if (!size)
|
||||
size = 32;
|
||||
UI_DrawHandlePic(uiInfo.uiDC.cursorx - size/2, uiInfo.uiDC.cursory - size/2, size, size, uiInfo.uiDC.Assets.cursor);
|
||||
}
|
||||
#ifndef NDEBUG
|
||||
if (uiInfo.uiDC.debug) {
|
||||
|
@ -1063,6 +1069,14 @@ qboolean Asset_Parse(int handle)
|
|||
continue;
|
||||
}
|
||||
|
||||
//Makro - added cursor size
|
||||
if (Q_stricmp(token.string, "cursorSize") == 0) {
|
||||
if (!PC_Int_Parse(handle, &uiInfo.uiDC.cursorSize)) {
|
||||
return qfalse;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (Q_stricmp(token.string, "fadeClamp") == 0) {
|
||||
if (!PC_Float_Parse(handle, &uiInfo.uiDC.Assets.fadeClamp)) {
|
||||
return qfalse;
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
//-----------------------------------------------------------------------------
|
||||
//
|
||||
// $Log$
|
||||
// Revision 1.16 2003/02/26 18:22:05 makro
|
||||
// Added an option to change crosshair size in assetGlobalDef's
|
||||
//
|
||||
// Revision 1.15 2003/02/13 21:19:51 makro
|
||||
// no message
|
||||
//
|
||||
|
@ -449,6 +452,8 @@ typedef struct {
|
|||
int frameTime;
|
||||
int cursorx;
|
||||
int cursory;
|
||||
//Makro - added cursor size
|
||||
int cursorSize;
|
||||
qboolean debug;
|
||||
|
||||
cachedAssets_t Assets;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
{
|
||||
assetGlobalDef {
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2" // cursor
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2.tga" // cursor
|
||||
gradientBar "ui/assets/gradientbar2.tga" // gradient bar
|
||||
fadeClamp 1.0 // sets the fadeup alpha
|
||||
fadeCycle 1 // how often fade happens in milliseconds
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// hud menu defs
|
||||
//
|
||||
{
|
||||
loadMenu { "ui/hud.menu" }
|
||||
loadMenu { "ui/score.menu" }
|
||||
loadMenu { "ui/teamscore.menu" }
|
||||
// loadMenu { "ui/hud.menu" }
|
||||
// loadMenu { "ui/score.menu" }
|
||||
// loadMenu { "ui/teamscore.menu" }
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
// hud menu defs
|
||||
//
|
||||
{
|
||||
loadMenu { "ui/min_hud.menu" }
|
||||
loadMenu { "ui/score.menu" }
|
||||
loadMenu { "ui/teamscore.menu" }
|
||||
// loadMenu { "ui/min_hud.menu" }
|
||||
// loadMenu { "ui/score.menu" }
|
||||
// loadMenu { "ui/teamscore.menu" }
|
||||
}
|
||||
|
|
|
@ -6,7 +6,8 @@
|
|||
font "fonts/font" 16 // font
|
||||
smallFont "fonts/smallfont" 12 // font
|
||||
bigFont "fonts/bigfont" 20 // font
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2" // cursor
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2.tga" // cursor
|
||||
cursorSize 64
|
||||
gradientBar "ui/assets/gradientbar2.tga" // gradient bar
|
||||
itemFocusSound "sound/misc/menu2.wav" // sound for item getting focus (via keyboard or mouse )
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
smallFont "fonts/smallfont" 12 // font
|
||||
bigFont "fonts/bigfont" 20 // font
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2.tga" // cursor
|
||||
cursorSize 64
|
||||
gradientBar "ui/assets/gradientbar2.tga" // gradient bar
|
||||
itemFocusSound "sound/misc/menu2.wav" // sound for item getting focus (via keyboard or mouse )
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
font "fonts/font" 16 // font
|
||||
smallFont "fonts/smallfont" 12 // font
|
||||
bigFont "fonts/bigfont" 20 // font
|
||||
cursor "gfx/rq3_ta_hud/3_cursor2.tga" // cursor
|
||||
cursor "gfx/rq3_ta_hud/3_cursor3.tga" // cursor
|
||||
gradientBar "ui/assets/gradientbar2.tga" // gradient bar
|
||||
itemFocusSound "sound/misc/menu2.wav" // sound for item getting focus (via keyboard or mouse )
|
||||
|
||||
|
|
Loading…
Reference in a new issue