From 8ffc66b034383508c56573ee4734691390611846 Mon Sep 17 00:00:00 2001 From: Rafael Barreto Date: Thu, 27 May 2010 03:37:45 +0000 Subject: [PATCH] clean up git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5080 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 4 ++-- source/src/console.cpp | 3 ++- source/src/worldio.cpp | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index c037afc8..6258d6a8 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -834,7 +834,7 @@ void startmap(const char *name, bool reset) // called just after a map load copystring(clientmap, name); sendmapidenttoserver = true; // Added by Rick - if(m_botmode) BotManager.BeginMap(name); + if(m_botmode) BotManager.BeginMap(name); else kickallbots(); // End add by Rick clearbounceents(); @@ -842,7 +842,7 @@ void startmap(const char *name, bool reset) // called just after a map load preparectf(!m_flags); suicided = -1; spawncycle = -1; - lasthit = 0; + lasthit = 0; if(m_valid(gamemode) && !m_mp(gamemode)) respawnself(); else findplayerstart(player1); diff --git a/source/src/console.cpp b/source/src/console.cpp index 92f486da..c1a30966 100644 --- a/source/src/console.cpp +++ b/source/src/console.cpp @@ -118,7 +118,8 @@ void conoutf(const char *s, ...) and chatting in this test period is extremelly important : Brahma */ int rendercommand(int x, int y, int w) { - defformatstring(s)("> %s", cmdline.buf); + defformatstring(s)("# %s", cmdline.buf); /** I changed the symbol here to differentiate from the > (new talk symbol), + and make clear the console changed to the old players (like me) : Brahma */ int width, height; text_bounds(s, width, height, w); y -= height - FONTH; diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp index b14f6b2d..46307d3b 100644 --- a/source/src/worldio.cpp +++ b/source/src/worldio.cpp @@ -625,7 +625,7 @@ bool load_world(char *mname) // still supports all map formats that have } Mh = Ma ? (float)Mv/Ma : 0; if(f) delete f; - c2skeepalive(); + c2skeepalive(); calclight(); conoutf("read map %s rev %d (%d milliseconds)", cgzname, hdr.maprevision, watch.stop()); conoutf("%s", hdr.maptitle); @@ -638,18 +638,18 @@ bool load_world(char *mname) // still supports all map formats that have persistidents = true; popscontext(); - c2skeepalive(); - watch.start(); + c2skeepalive(); + watch.start(); loopi(256) if(texuse[i]) lookupworldtexture(i); - printf("loaded textures (%d milliseconds)\n", watch.stop()); - c2skeepalive(); - watch.start(); - preload_mapmodels(); - printf("loaded mapmodels (%d milliseconds)\n", watch.stop()); - c2skeepalive(); - watch.start(); + printf("loaded textures (%d milliseconds)\n", watch.stop()); + c2skeepalive(); + watch.start(); + preload_mapmodels(); + printf("loaded mapmodels (%d milliseconds)\n", watch.stop()); + c2skeepalive(); + watch.start(); audiomgr.preloadmapsounds(); - printf("loaded mapsounds (%d milliseconds)\n", watch.stop()); + printf("loaded mapsounds (%d milliseconds)\n", watch.stop()); c2skeepalive(); startmap(mname);