rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-13 22:22:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOQ3 commit 2247

Browse source
This commit is contained in:
Richard Allen 2012-10-04 14:18:32 +00:00
parent 1a3b602681
commit dc71639588
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/code/cgame/cg_weapons.c
View file

@ -1109,7 +1109,7 @@ void CG_RegisterItemVisuals(int itemNum)
item = &bg_itemlist[itemNum];
memset(itemInfo, 0, sizeof(&itemInfo));
memset(itemInfo, 0, sizeof(*itemInfo));
itemInfo->registered = qtrue;
itemInfo->models[0] = trap_R_RegisterModel(item->world_model[0]);
itemInfo->icon = trap_R_RegisterShader(item->icon);

5
reaction/code/ui/ui_shared.c
View file

@ -6152,7 +6152,8 @@ void Item_OwnerDraw_Paint(itemDef_t * item)
void Item_Paint(itemDef_t * item)
{
vec4_t red;
menuDef_t *parent = (menuDef_t *) item->parent;
//menuDef_t *parent = (menuDef_t *) item->parent;
menuDef_t *parent;
red[0] = red[3] = 1;
red[1] = red[2] = 0;
@ -6185,6 +6186,8 @@ void Item_Paint(itemDef_t * item)
}
*/
parent = (menuDef_t*)item->parent;
if (item->window.flags & WINDOW_ORBITING) {
if (DC->realTime > item->window.nextTime) {
float rx, ry, a, c, s, w, h;