Make sure banner image exists

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index 1e87e8869ec5d9443c3147dde51298a675738f94..2487582cb9ebc85d93eb899aff424b96bc5780e4 100644 (file)
--- a/gfx/menu/luma/skinvalues.txt
+++ b/gfx/menu/luma/skinvalues.txt
@@ -90,9 +90,10 @@ COLOR_DIALOG_VIEW             '1 1 1'
 COLOR_DIALOG_MODEL            '1 1 1'
 COLOR_DIALOG_CROSSHAIR        '1 1 1'
 COLOR_DIALOG_HUD              '1 1 1'
-COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1'
 COLOR_DIALOG_SERVERINFO       '1 1 1'
+COLOR_DIALOG_SCREENSHOTVIEWER '1 1 1'
 COLOR_DIALOG_FIRSTRUN         '1 1 1'
+COLOR_DIALOG_WELCOME          '1 1 1'
 COLOR_DIALOG_CVARS            '1 0.2 0.15'
 COLOR_DIALOG_HUDCONFIRM       '1 0.2 0.15'
 

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 99fecda0bbfc2855600c02a3ec2629845511f730..861543ee3baeb25f0b4a778e447189a950640f6d 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -280,6 +280,16 @@ bool fexists(string f)
     return true;
 }
 
+bool ImageExists(string img)
+{
+       if(fexists(strcat(img, ".tga"))) return true;
+       if(fexists(strcat(img, ".png"))) return true;
+       if(fexists(strcat(img, ".jpg"))) return true;
+       if(fexists(strcat(img, ".pcx"))) return true;
+
+       return false;
+}
+
 // Databases (hash tables)
 const float DB_BUCKETS = 8192;
 void db_save(float db, string pFilename)

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 4de610f26fcc2113587a64019db6b55fb71ae647..e28a3862609e27cb062160a23193126967ecf525 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -75,6 +75,7 @@ float median(float a, float b, float c);
 string ftos_decimals(float number, float decimals);
 
 bool fexists(string f);
+bool ImageExists(string img);
 
 vector colormapPaletteColor(float c, float isPants);
 

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index dac57f34a49e58111da1d6f35173dd6195b501d8..5eecda0e2322155899994913e9b14742098e0134 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -63,7 +63,7 @@ void GameCommand(string theCommand)
 
        if(argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
        {
-               float i;
+               int i;
                entity e;
                string s;
                string filter = string_null;

diff --git a/qcsrc/menu/xonotic/dialog_welcome.qc b/qcsrc/menu/xonotic/dialog_welcome.qc
index 49c9ab4e81c04008c23244bc26b91de456c6e0e1..b99f81be46c0639ac178ecb724c9aad907d7cab8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_welcome.qc
+++ b/qcsrc/menu/xonotic/dialog_welcome.qc
@@ -47,7 +47,7 @@ void XonoticWelcomeDialog_configureDialog(entity me)
 }
 void XonoticWelcomeDialog_readInputArgs(entity me, float argsbuf)
 {
-       float i = 0;
+       int i = 0;
        string s;
        welcomeDialog_resetStrings(me);
        while((s = bufstr_get(argsbuf, i)) != "")

diff --git a/qcsrc/menu/xonotic/textlistbox.qc b/qcsrc/menu/xonotic/textlistbox.qc
index c42754d3ba703b356c358caec605deae3f8fc9cc..48451ee1f57619aee98c764317bef0644e7f135d 100644 (file)
--- a/qcsrc/menu/xonotic/textlistbox.qc
+++ b/qcsrc/menu/xonotic/textlistbox.qc
@@ -51,7 +51,7 @@ void XonoticTextListBox_resizeNotify(entity me, vector relOrigin, vector relSize
 }
 void XonoticTextListBox_setText(entity me, string theText)
 {
-       float i, k;
+       int i, k;
        string ts;
        if(me.textbuf >= 0)
                buf_del(me.textbuf);

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 6111527a1585a868fd889d2fdfe68bd25ba1a5ac..133d2a66908c8ed353605153c32926ae9f2ac165 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -774,15 +774,27 @@ void serverinfo_welcomemessage_send()
        WriteString(MSG_ONE, "128.03.192.999"); // FIXME: send the real server ip
        WriteString(MSG_ONE, autocvar_hostname);
        WriteString(MSG_ONE, getwelcomemessage());
-       WriteString(MSG_ONE, strcat("128.03.192.999", "/banner"));
+       string pic = strcat("128.03.192.999", "/banner");
+       if(ImageExists(pic))
+       {
+               print("Warning: image %s doesn't exist!\n", pic);
+               pic = "";
+       }
+       WriteString(MSG_ONE, pic);
 }
 
 void serverinfo_pic_send()
 {
+       string pic = strcat("128.03.192.999", "/banner");
+       if(ImageExists(pic))
+       {
+               print("Cannot send %s, file doesn't exist!\n", pic);
+               return;
+       }
        msg_entity = self;
        WriteByte(MSG_ONE, SVC_TEMPENTITY);
        WriteByte(MSG_ONE, TE_CSQC_SERVERINFO_PIC);
-       WritePicture(MSG_ONE, strcat("128.03.192.999", "/banner"), 3072);
+       WritePicture(MSG_ONE, pic, 3072);
 }
 
 /*