From 66f2d3dee835aece4ffe5a87d5188c911ab7c686 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Thu, 5 Apr 2007 23:44:51 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@929 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/main.cpp      | 27 ++++++++++++++-------------
 source/src/protos.h      |  2 +-
 source/src/renderhud.cpp | 12 ++++++++++--
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/source/src/main.cpp b/source/src/main.cpp
index 18315afe..a7cc57b2 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -167,8 +167,8 @@ int main(int argc, char **argv)
     int fs = SDL_FULLSCREEN, depth = 0, bpp = 0, fsaa = 0, par = 0, uprate = 0, maxcl = DEFAULTCLIENTS;
     char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = NULL, *masterpwd = NULL;
 
-    #define log(s) puts("init: " s)
-    log("sdl");
+    #define initlog(s) puts("init: " s)
+    initlog("sdl");
     
     for(int i = 1; i<argc; i++)
     {
@@ -202,19 +202,19 @@ int main(int argc, char **argv)
 
     if(SDL_Init(SDL_INIT_TIMER|SDL_INIT_VIDEO|par)<0) fatal("Unable to initialize SDL");
 
-    log("net");
+    initlog("net");
     if(enet_initialize()<0) fatal("Unable to initialise network module");
 
     initclient();
     initserver(dedicated, uprate, sdesc, ip, master, passwd, maxcl, maprot, masterpwd);  // never returns if dedicated
       
-    log("world");
+    initlog("world");
     empty_world(7, true);
 
-    log("video: sdl");
+    initlog("video: sdl");
     if(SDL_InitSubSystem(SDL_INIT_VIDEO)<0) fatal("Unable to initialize SDL Video");
 
-    log("video: mode");
+    initlog("video: mode");
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
     if(depth) SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, depth);
     if(fsaa)
@@ -231,7 +231,7 @@ int main(int argc, char **argv)
     fullscreen = fs!=0;
     VIRTW = scr_w*VIRTH/scr_h;
 
-    log("video: misc");
+    initlog("video: misc");
     SDL_WM_SetCaption("ActionCube", NULL);
     #ifndef WIN32
     if(fs)
@@ -240,19 +240,20 @@ int main(int argc, char **argv)
     keyrepeat(false);
     SDL_ShowCursor(0);
 
-    log("gl");
+    initlog("gl");
     gl_init(scr_w, scr_h, bpp, depth, fsaa);
 
     crosshair = textureload("packages/misc/crosshairs/default.png");
     if(!crosshair) fatal("could not find core textures (hint: run ActionCube from the parent of the bin directory)");
 
 	loadingscreen();
+
     particleinit();
 
-    log("sound");
+    initlog("sound");
     initsound();
 
-    log("cfg");
+    initlog("cfg");
     extern void *scoremenu, *teammenu, *ctfmenu, *servmenu, *kickmenu, *banmenu;
     scoremenu = addmenu("score", "frags\tpj\tping\tname\tcn", false, renderscores);
     teammenu = addmenu("team score", "frags\tpj\tping\tteam\tname\tcn", false, renderscores);
@@ -272,18 +273,18 @@ int main(int argc, char **argv)
     if(!execfile("config/saved.cfg")) exec("config/defaults.cfg");
     execfile("config/autoexec.cfg");
 
-    log("models");
+    initlog("models");
     preload_playermodels();
     preload_hudguns();
     preload_entmodels();
 
     execute("start_game");
 
-    log("localconnect");
+    initlog("localconnect");
     localconnect();
     changemap("maps/ac_complex");
    
-    log("mainloop");
+    initlog("mainloop");
     int ignore = 5, grabmouse = 0;
 #ifdef _DEBUG
 	int lastflush = 0;
diff --git a/source/src/protos.h b/source/src/protos.h
index f73e6e8e..35dcbcc8 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -196,7 +196,7 @@ extern void pruneundos(int maxremain = 0);
 // renderhud
 extern void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater);
 extern void damageblend(int n);
-extern void loadingscreen();
+extern void loadingscreen(const char *fmt = NULL, ...);
 extern void show_out_of_renderloop_progress(float bar1, const char *text1, float bar2 = 0, const char *text2 = NULL);
 
 // renderparticles
diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp
index 4ffa9b40..912e5ca7 100644
--- a/source/src/renderhud.cpp
+++ b/source/src/renderhud.cpp
@@ -352,7 +352,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
     glEnable(GL_DEPTH_TEST);
 }
 
-void loadingscreen()
+void loadingscreen(const char *fmt, ...)
 {
     static Texture *logo = NULL;
     if(!logo) logo = textureload("packages/misc/startscreen.png");
@@ -370,10 +370,18 @@ void loadingscreen()
     glClearColor(0, 0, 0, 1);
     glColor3f(1, 1, 1);
 
-    loopi(2)
+    loopi(fmt ? 1 : 2)
     {
         glClear(GL_COLOR_BUFFER_BIT);
         quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
+        if(fmt)
+        {
+            glEnable(GL_BLEND);
+            s_sprintfdlv(str, fmt, fmt);
+            int w = text_width(str);
+            draw_text(str, w>=VIRTW ? 0 : (VIRTW-w)/2, VIRTH*3/4);
+            glDisable(GL_BLEND);
+        }
         SDL_GL_SwapBuffers();
     }