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

Warnings removed two?

Browse source
This commit is contained in:
Andrei Drexler 2012-10-14 00:11:26 +00:00
parent d0021605af
commit 48bf1303c5
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3435,11 +3435,11 @@ static void Scroll_ListBox_ThumbFunc(void *p)
max = Item_ListBox_MaxScroll(si->item); max = Item_ListBox_MaxScroll(si->item);
//vectors? //vectors?
if (r.hasVectors) { if (r.hasVectors) {
float p[2]; float pt[2];
//Makro - FIXME!!! //Makro - FIXME!!!
Rect_ToInnerCoords(&si->item->window.rect, DC->cursorx, DC->cursory, &p[0], NULL); Rect_ToInnerCoords(&si->item->window.rect, DC->cursorx, DC->cursory, &pt[0], NULL);
p[1] = (p[0] - SCROLLBAR_SIZE / 2 - SCROLLBAR_SIZE - 1) / (si->item->window.rect.w - 3 * SCROLLBAR_SIZE - 2); pt[1] = (pt[0] - SCROLLBAR_SIZE / 2 - SCROLLBAR_SIZE - 1) / (si->item->window.rect.w - 3 * SCROLLBAR_SIZE - 2);
pos = (int) (max * p[1]); pos = (int) (max * pt[1]);
//no vectors //no vectors
} else { } else {
r.x = si->item->window.rect.x + SCROLLBAR_SIZE + 1; r.x = si->item->window.rect.x + SCROLLBAR_SIZE + 1;
@ -3462,15 +3462,15 @@ static void Scroll_ListBox_ThumbFunc(void *p)
max = Item_ListBox_MaxScroll(si->item); max = Item_ListBox_MaxScroll(si->item);
//vectors? //vectors?
if (r.hasVectors) { if (r.hasVectors) {
float p[2]; float pt[2];
Vector2Set(p, DC->cursorx - si->item->window.rect.x, DC->cursory - si->item->window.rect.y); Vector2Set(pt, DC->cursorx - si->item->window.rect.x, DC->cursory - si->item->window.rect.y);
//projection //projection
//p[0] = p[0] * si->item->window.rect.v[0] + p[1] * si->item->window.rect.v[1]; //p[0] = p[0] * si->item->window.rect.v[0] + p[1] * si->item->window.rect.v[1];
Rect_ToInnerCoords(&si->item->window.rect, DC->cursorx, DC->cursory, NULL, &p[0]); Rect_ToInnerCoords(&si->item->window.rect, DC->cursorx, DC->cursory, NULL, &pt[0]);
//0..1 fraction //0..1 fraction
p[1] = (p[0] - SCROLLBAR_SIZE / 2 - SCROLLBAR_SIZE - 1) / (si->item->window.rect.h - 3 * SCROLLBAR_SIZE - 2); pt[1] = (pt[0] - SCROLLBAR_SIZE / 2 - SCROLLBAR_SIZE - 1) / (si->item->window.rect.h - 3 * SCROLLBAR_SIZE - 2);
pos = (int) (max * p[1]); pos = (int) (max * pt[1]);
//no vectors //no vectors
} else { } else {
r.x = si->item->window.rect.x + si->item->window.rect.w - SCROLLBAR_SIZE - 1; r.x = si->item->window.rect.x + si->item->window.rect.w - SCROLLBAR_SIZE - 1;
@ -6063,12 +6063,9 @@ void Item_ListBox_Paint(itemDef_t * item)
void Item_OwnerDraw_Paint(itemDef_t * item) void Item_OwnerDraw_Paint(itemDef_t * item)
{ {
menuDef_t *parent;
if (item == NULL) { if (item == NULL) {
return; return;
} }
parent = (menuDef_t *) item->parent;
if (DC->ownerDrawItem) { if (DC->ownerDrawItem) {
vec4_t color, lowLight; vec4_t color, lowLight;