From 87d69da51f52c5ad4d4c47ee9424281e0e807e29 Mon Sep 17 00:00:00 2001 From: flowtron Date: Mon, 14 Feb 2011 18:02:48 +0000 Subject: [PATCH] minor fixes & comments git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6101 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus.cfg | 2 +- source/src/clientgame.cpp | 3 +-- source/src/clients2c.cpp | 2 +- source/src/tools.cpp | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/menus.cfg b/config/menus.cfg index b3602a10..eaa46378 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -76,7 +76,7 @@ menuitem " 2 [ Download ] " "getdemo $dldemo" newmenu "Play demo" // If not in-game (recording/downloading demos isn't needed) menuinit [ echo "To stop demo playback, type: 3/stopdemo" ] -menudirlist "demos/" "dmo" "demo $arg1" +menudirlist "demos" "dmo" "demo $arg1" // in-game menu that opens when pressing escape while watching a demo. newmenu "Watching demo" diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index b5f85087..8d27089d 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -1251,8 +1251,7 @@ int vote(int v) putint(p, SV_VOTE); putint(p, v); sendpackettoserv(1, p.finalize()); - // flowtron : 2008 11 06 : I don't think the following comments are still current - if(!curvote) { /*printf(":: curvote vanished!\n");*/ return 0; } // flowtron - happens when I call "/stopdemo"! .. seems the map-load happens in-between + if(!curvote) return 0; curvote->stats[v]++; curvote->localplayervoted = true; return 1; diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index e4d83386..f9ebd91a 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -378,7 +378,7 @@ void onChangeVote(int mod, int id) } } -VAR(voicecomsounds, 0, 1, 2); +VARP(voicecomsounds, 0, 1, 2); bool medals_arrived=0; medalsst a_medals[END_MDS]; void parsemessages(int cn, playerent *d, ucharbuf &p) diff --git a/source/src/tools.cpp b/source/src/tools.cpp index ec09814e..ef680e99 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -158,7 +158,8 @@ mapstats *loadmapstats(const char *filename, bool getlayout) if(cwy > mapdims[3]) mapdims[3] = cwy; } loopk(2) mapdims[k+4] = mapdims[k+2] - mapdims[k]; -/* printf(" min X|Y: %3d : %3d\n", mapdims[0], mapdims[1]); +/* TODO: 2011feb11:ft: make use of this better method to deal with the map-quality-checks + printf(" min X|Y: %3d : %3d\n", mapdims[0], mapdims[1]); printf(" max X|Y: %3d : %3d\n", mapdims[2], mapdims[3]); printf("delta X|Y: %3d : %3d\n", mapdims[4], mapdims[5]); fflush(stdout);*/