From 8f9024bb55e0c906b43b5c2147bebbace6356171 Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Thu, 31 Aug 2006 21:32:36 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@374 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/cube.h       |   5 ++++-
 source/src/main.cpp     |   2 ++
 source/src/server.cpp   |  16 ++++++++--------
 source/vcpp/cube.suo    | Bin 21504 -> 18432 bytes
 source/vcpp/cube.vcproj |   3 +++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/source/src/cube.h b/source/src/cube.h
index 7b7f5438..afeec09c 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -404,7 +404,8 @@ extern bool demoplayback;
 4 - team survior
 5 - ctf
 6 - pistols
-7 - botmatch
+7 - bot dm
+8 - bot tdm
 */
 
 #define m_noitems     (m_arena)
@@ -420,6 +421,8 @@ extern bool demoplayback;
 //#define m_classicsp   (gamemode==-2)
 #define isteam(a,b)   (m_teammode && strcmp(a, b)==0)
 
+#define srvm_notimelimit (mode==1 || mode==7 || mode==8)
+
 #define TEAM_CLA 0 //
 #define TEAM_RVSF 1 //
 // rb means red/blue
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 14adf2cb..064ee08e 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -197,6 +197,7 @@ int main(int argc, char **argv)
     
     log("mainloop");
     int ignore = 5;
+	int lastflush = 0;
     for(;;)
     {
         int millis = SDL_GetTicks()*gamespeed/100;
@@ -248,6 +249,7 @@ int main(int argc, char **argv)
                     break;
             };
         };
+		if(millis>lastflush+60000) { fflush(stdout); lastflush = millis; }
     };
     quit();
     return 1;
diff --git a/source/src/server.cpp b/source/src/server.cpp
index cda7371b..b3adb410 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -555,7 +555,9 @@ void process(ENetPacket * packet, int sender)   // sender may be -1
             sgetstr();
             int reqmode = getint(p);
             if(reqmode<0) reqmode = 0;
+			printf("SV_MAPCHANGE %i %s", reqmode, text);
             if(smapname[0] && !mapreload && !vote(text, reqmode, sender)) return;
+			printf(" - accepted\n");
             mapreload = false;
             mode = reqmode;
             minremain = m_ctf_s ? 10 : (mode&1 ? 15 : 10);
@@ -781,7 +783,7 @@ void checkintermission()
     send2(true, -1, SV_TIMEUP, minremain--);
 };
 
-void startintermission() { minremain = 0; checkintermission(); };
+/*void startintermission() { minremain = 0; checkintermission(); };*/
 
 void resetserverifempty()
 {
@@ -832,7 +834,8 @@ void serverslice(int seconds, unsigned int timeout)   // main server update, cal
     
     lastsec = seconds;
     
-    if((mode>1 || (mode==0 && nonlocalclients)) && seconds>mapend-minremain*60) checkintermission();
+    //if((mode>1 || (mode==0 && nonlocalclients)) && seconds>mapend-minremain*60) checkintermission();
+	if(((srvm_notimelimit && !nonlocalclients) || (mode==0 && nonlocalclients)) && seconds>mapend-minremain*60) checkintermission();
     if(interm && seconds>interm)
     {
         interm = 0;
@@ -844,10 +847,10 @@ void serverslice(int seconds, unsigned int timeout)   // main server update, cal
             changemap();
             ctfbroadcast = true;
         }
-        else
-        loopv(clients) if(clients[i].type!=ST_EMPTY)
+        else loopv(clients) if(clients[i].type!=ST_EMPTY)
         {
             send2(true, i, SV_MAPRELOAD, 0);    // ask a client to trigger map reload
+			printf("SV_MAPRELOAD\n"); //fixme
             mapreload = true;
             break;
         };
@@ -871,7 +874,7 @@ void serverslice(int seconds, unsigned int timeout)   // main server update, cal
         nonlocalclients = 0;
         loopv(clients) if(clients[i].type==ST_TCPIP) nonlocalclients++;
         laststatus = seconds;     
-        if(nonlocalclients || bsend || brec) printf("status: %d remote clients, %.1f send, %.1f rec (K/sec)\n", nonlocalclients, bsend/60.0f/1024, brec/60.0f/1024);
+		if(nonlocalclients || bsend || brec) { printf("status: %d remote clients, %.1f send, %.1f rec (K/sec)\n", nonlocalclients, bsend/60.0f/1024, brec/60.0f/1024); fflush(stdout); }
         bsend = brec = 0;
     };
 
@@ -912,9 +915,6 @@ void serverslice(int seconds, unsigned int timeout)   // main server update, cal
             disconnect_client(lastconnect, "maxclients reached");
         };
     };
-    #ifndef WIN32
-        fflush(stdout);
-    #endif
 };
 
 void cleanupserver()
diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo
index 19f2d5fed7e33b304bcf6fc977ab766816ea87f6..d71edfc7f0ec01a13af16e6de9e40b865ea2eef7 100644
GIT binary patch
delta 2862
zcmbuBYiv_x7{}kY>$-JoOS^U(x3aU1jcwhfLv~@CY=vPI6WQdd4kugdHt9CpI$#57
z!GRzuut)KN%HV@Rk?TRh#K1y~A54gV#t$YKVnY0+@<C%T#`%9v+p$q1E}rIhp7-*c
z_q@;TJq;a|p?&gHgU*pEgh&S|U>f*)baa%w1|>d=JEt2r$|1eq;<nW9t-t)GjKg54
zSRK%RAWK;@3H@YX0%l+VQvlB~yedlvWCb-E_82SCnhzT3reTg;M&^X<;8OG-1JS2g
zK0dC$0_~Mx6<7_P08fIaKoeL4o(9d}8L$?#fL7oIKJYAP1MQ##JO|bRKei$|(dYu*
zU_E#q^nhLv0DWKs*a$X(elP$wgDv0%uoVPB2%Jg$LT7>zn%ykvs(v>8mh`n**f1Rr
z?u;gf46kBfi;)IQ12U0*HwC4U`piMQ6~pW~zGPU?{(=&km6fE1ET2o+M49?@+CC+X
z3ary<(Aq`cTP;+jJVYb;RdMkmSzTl+mC{CiDM5oBD;$vYXUc$KIhwT=8nADbm2}%4
zlyj-yvBWHSQ_(BDWk-W40m>5w1F3_uUA>+9bDUhL{xr=d<%oKFx>;r_Vu4UZF@8;v
zdn;nn4fh4m4~R{4(D@C0H}mKUj%E?uSt{m=O5w&+MTkr(T64ubtrx(ZM>`QoKO)+W
z-hEbA4?1^C3T4#EcG_0ZM%T*~+FnpeA*E4nR<9{KX}pQ|#!KWXHQMZSD|4%DCRX-g
zeJ}1k2zV0(vphB*(!qxvbGGnhp^I4=Q>@4+XkbR0rK`3QwK)5Nbkt)>Ls(N>J~l7q
z*9*sgpkJJIRF~7@<Y?F9nHKn=O;n>*jgi%O1eHTYvphq&^(HP94iGz<J+B6G_sRH!
z7&%FvymaFXoe-5Eg*P5o8z<;Qc?s<<bI@M}4ob^csNQ8YCgBBZ;W8gx&zVMrnTb|C
zR={PEo8jAXQAQ)~snk@FoVcsHD`B{%D?xQF%$N2Io#4{uYiy!zkw@B<*a<4By+Hko
zd&ylrZkdboq&!lrqmi;Ydsgg2s=fRXY0r+Gpzeys;5NK>J9rTcf*oKdcnRzRyTQv~
z4|oOe0r48-Ua$}B2Sb3s>);J=0K5s_0&jzN0Q>V@@E&*{90J2aB#Fal904EEVO_?9
z$I$v190w=BNpK3B24{c@&Vo<Cr{Eko4?Y7pGG|B{sklKiYsa}qtt^%HoLKYKKjzPu
z_S}0+EUJe4=fqBE?*Gx{pq!eO^r*+E<i+YBw?u*#dYwq4hQiZi&F2S}4O!~wiYtk}
z$}mX-b+}ydEl~B6v^_wFsw}~1-Z$YG>_O!QKr8U0e)%+A8p#rtZuHXuzl<-I9F*u9
z%`s~<qk4GOi&J4O)?0^mH%<XRM!iT~-*V1f3<jX6h&-_vp9L<%hoROBsfYs59_baL
z9o1-n9v5&}V|}ETkL@VrbZ1k@?Iyn~Z<6MEP;q>*EP=e++*=s?H*?!zCY#F!HscGz
zJM6%xs2@GJHHb+*Nm@12CS&emZ83IK*kIpS|Nc&44UTD-s0jP?jt?h>JiIikcH$Sd
zggt8hA0GWyVgXz%iy-gz=p~H(caM7E&EAMHnj?dg_T;@2=Z=pi=OQCVn|)+rAGtMS
z(?zP@qr*R?(a{N|T4fxrsWP%kxKxFhic<a188!c&HAv?dtZFVRpHOspSfW+?jB!bI
zAg}=~(>gWp^y1FJ&KoOUsE>W6&Rt2V@?W}QJG)Q}&tBrZ#&akZg+`2N<knkIG#hYu
zoT5Q@VWgcF+!;9qqVnz_@_#X|^qxq{_o4tgutgs>5#FAn&4;tli#Gea51Zu8wn6fF
zpp5AT(Bgw3{7)jE54PrUIcUw){EX45fUWMrt9@F|a=S*jX@_eK%t%X3h-{rDYinC4
Wk81`D)>EO|0pm;QMy_`ptNsDPJ6%fv

delta 2148
zcmeH{?N8fP6vyxV(MM=Y%dd>b^$7~?iqJwSl%fNHIhRbSsBD6Y@+1il3uA6pGrDNv
zlDz>=_F`%_hKVsz1MKHJ62^<g7!tBbvUiKw8#N|QNt`e6h4p)D3n&lSAK?AvlixY#
zo_p>&_bEQb<Dc_|b}2WHF;)O_z+Z_(BFS{LsMHCA3zUFT;09%&9C$!3Sd4b_8P%|9
z<L8PGS69E`8L+M7D>2n)JWvN&1k1wT0F1x{vVj?-CzDfhJw-KF^c~Q`pp$;kl=J7w
zs4Y1yJfGV!A`1Bh@CJAhyaZkbuYyzHG<XGcfo>qizlQ(opa;AOlCw`o&)?GBkqlZG
zME&qf(08g*dX#zB$So<$wlyoR(ZRSNQOpqIdiujKNj+^Ux?p@yC%mnI8Y8VV7qQY*
zSx`A{`kK@Ivg6ch9wooZL^@M2yO)izQ8vJa*dS9gv(jP-aGpcwawat*fLWqHb7C3?
z#3d`m<cs_cZOW58MDJKnP>UfzkF4zm;VBXmEt&E}?g#vBWi$6-2Dd3c6<9d$Q#K2Y
zoc#87C06X=b{mE~!OpXK=EvuN{1yvs$rDs%k18i@Ax^R4Zi?HRC>}Y)C2}71hP$!W
z=hy@i?`Ic4FRKItD4>${K_5u=55uDoK4)MVWlv$pGwHVZ8Hziiyhd4fNL>FTa!_*|
z28vo_+HhX9WFo*Af}KT=XeOF;HPgDwmSsS$V{Duavp%}*$)j~krBYe4%&jL8Al=r!
z2<H5@{MGk#-(6ZXo|=3di3}kL5wjl=(CDbUmo`eQ*y>Xlo<%oZc0NdVJq7wR@Mi2u
zmO%-3n?Vg(9Le;;DidW>T<?RW29%1t)%lR>$?24-$D&eSh4yJ$(_evh17r(Ny$W;b
zL1t2e89ScRtR0Ysg(=lUDRjMUfa+U5B8{biR_rU}H)&=Z9vby{DDDl=rKfMw)vz^_
zvH8>}GWkm=FJyF-ODw%E3te3Lwwp^r*Q)+;ES{-dB#*<O9>Idw&}_J?Dp1W>9?MsK
zDIs1W;W;RP#0qC>`{pVowU{_WmSd47vF=d%k`v@Hk7_I<8R(G2#6uw3<;XqlY~wxc
z&P+`FU7WfQt0jM%-^}V*HNF6A#n-})&3N<Wg6#n5QWT#zmoG-=`E*Z|9Kn;Kl#D?(
zEDF&Ds%wIxUL{e%In4%}<imSJ=<q+wW!vr!nh!+D-`r1!eL5Nmo|WypeU#sW0WLfC
z=%@>YIsH<RrQ6E%{kmo@yLP*#=IM0rd;s>nS#+zplRowt>65^AY)Vwjk<F#4eXJ1w
zy_{Pi9|U)VT=Ff`uWeR(*w8@_Dhy8dLB{~^B&SQ>RZ4{Qvb0^}<;a?DwsB2IgGa9I
zzk^;b7jBQ)TCl+*Sg@i!I+lD`^x{1_{@-W3Yx_RJkG0S89{arWCTK_SrVp`Ealxp{
RZ*i0zd@la=zEopW!{4zL`%3@-

diff --git a/source/vcpp/cube.vcproj b/source/vcpp/cube.vcproj
index e65d4525..842450f9 100644
--- a/source/vcpp/cube.vcproj
+++ b/source/vcpp/cube.vcproj
@@ -433,6 +433,9 @@
 			<Filter
 				Name="enet"
 				Filter="">
+				<File
+					RelativePath="..\enet\callbacks.c">
+				</File>
 				<File
 					RelativePath="..\enet\host.c">
 					<FileConfiguration