From add2ac34a0dca6159ba8a6bcf6805db61e445268 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 4 Feb 2012 20:10:06 +0100 Subject: [PATCH] Fix some post-merge issues --- gfx/menu/luminos/skinvalues.txt | 1 + gfx/menu/wickedx/skinvalues.txt | 2 +- gfx/menu/xaw/skinvalues.txt | 2 +- qcsrc/menu/xonotic/dialog_multiplayer.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt index 316ae273f..a8aeb4b5b 100755 --- a/gfx/menu/luminos/skinvalues.txt +++ b/gfx/menu/luminos/skinvalues.txt @@ -180,6 +180,7 @@ COLOR_DIALOG_MODEL '1 1 1' COLOR_DIALOG_CROSSHAIR '1 1 1' COLOR_DIALOG_HUD '1 1 1' COLOR_DIALOG_SERVERINFO '1 1 1' +COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1' COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_HUDCONFIRM '1 0 0' diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt index d391011a5..2757c1fc2 100644 --- a/gfx/menu/wickedx/skinvalues.txt +++ b/gfx/menu/wickedx/skinvalues.txt @@ -180,8 +180,8 @@ COLOR_DIALOG_MODEL '1 1 1' COLOR_DIALOG_CROSSHAIR '1 1 1' COLOR_DIALOG_HUD '1 1 1' COLOR_DIALOG_SERVERINFO '1 1 1' -COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1' +COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_HUDCONFIRM '1 0 0' // item: input box diff --git a/gfx/menu/xaw/skinvalues.txt b/gfx/menu/xaw/skinvalues.txt index 23b0a1650..831543976 100644 --- a/gfx/menu/xaw/skinvalues.txt +++ b/gfx/menu/xaw/skinvalues.txt @@ -35,8 +35,8 @@ COLOR_DIALOG_MODEL '1 1 1' COLOR_DIALOG_CROSSHAIR '1 1 1' COLOR_DIALOG_HUD '1 1 1' COLOR_DIALOG_SERVERINFO '1 1 1' -COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1' +COLOR_DIALOG_CVARS '1 0 0' COLOR_DIALOG_HUDCONFIRM '1 0 0' // nexposee positions of windows (they are the scale transformation diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer.c index 761696904..0ea419721 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer.c @@ -5,7 +5,7 @@ CLASS(XonoticMultiplayerDialog) EXTENDS(XonoticDialog) ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER) ATTRIB(XonoticMultiplayerDialog, intendedWidth, float, 0.96) ATTRIB(XonoticMultiplayerDialog, rows, float, 24) - ATTRIB(XonoticMultiplayerDialog, columns, float, 4) + ATTRIB(XonoticMultiplayerDialog, columns, float, 5) ENDCLASS(XonoticMultiplayerDialog) #endif diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c index 8fcdb9b32..94e7d6548 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_screenshot.c @@ -35,7 +35,7 @@ void XonoticScreenshotBrowserTab_fill(entity me) { entity e, btn, slist; slist = makeXonoticScreenshotList(); - const float slist_height = me.rows - 2; + float slist_height = me.rows - 2; me.TR(me); me.TD(me, 1, 0.5, e = makeXonoticTextLabel(0, "Filter:")); me.TD(me, 1, 0.5, btn = makeXonoticButton("Clear", '0 0 0')); -- 2.39.2