team lss, team pf (!testing only!) (bins included, vcpp 2010)

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6479 e016b1c5-ed68-44aa-a2f7-31cac88cffde

source/src/clientgame.cpp

@@ -1542,7 +1542,7 @@ void clearvote() { DELETEP(curvote); DELETEP(calledvote); }
 const char *modestrings[] =
 {
     "tdm", "coop", "dm", "lms", "ts", "ctf", "pf", "btdm", "bdm", "lss",
-    "osok", "tosok", "bosok", "htf", "tktf", "ktf"
+    "osok", "tosok", "bosok", "htf", "tktf", "ktf", "tpf", "tlss"
 };
 
 void setnext(char *arg1, char *arg2)

source/src/protocol.cpp

@@ -296,14 +296,14 @@ const char *modefullnames[] =
     "demo playback",
     "team deathmatch", "coopedit", "deathmatch", "survivor",
     "team survivor", "ctf", "pistol frenzy", "bot team deathmatch", "bot deathmatch", "last swiss standing",
-    "one shot, one kill", "team one shot, one kill", "bot one shot, one kill", "hunt the flag", "team keep the flag", "keep the flag"
+    "one shot, one kill", "team one shot, one kill", "bot one shot, one kill", "hunt the flag", "team keep the flag", "keep the flag", "team pistolfrenzy", "team last swiss standing"
 };
 
 const char *modeacronymnames[] =
 {
     "DEMO",
     "TDM", "coop", "DM", "SURV", "TSURV", "CTF", "PF", "BTDM", "BDM", "LSS",
-    "OSOK", "TOSOK", "BOSOK", "HTF", "TKTF", "KTF"
+    "OSOK", "TOSOK", "BOSOK", "HTF", "TKTF", "KTF", "TPF", "TLSS"
 };
 
 const char *voteerrors[] = { "voting is currently disabled", "there is already a vote pending", "already voted", "can't vote that often", "this vote is not allowed in the current environment (singleplayer/multiplayer)", "no permission", "invalid vote", "server denied your call", "the next map/mode is already set" };

source/src/protocol.h

@@ -101,13 +101,15 @@ enum
     GMODE_HUNTTHEFLAG,         // 13
     GMODE_TEAMKEEPTHEFLAG,
     GMODE_KEEPTHEFLAG,
+    GMODE_TEAMPF,
+    GMODE_TEAMLSS,
     GMODE_NUM
 };
 
 #define m_lms         (gamemode==3 || gamemode==4)
 #define m_ctf         (gamemode==5)
-#define m_pistol      (gamemode==6)
-#define m_lss         (gamemode==9)
+#define m_pistol      (gamemode==6 || gamemode==16)
+#define m_lss         (gamemode==9 || gamemode==17)
 #define m_osok        (gamemode>=10 && gamemode<=12)
 #define m_htf         (gamemode==13)
 #define m_ktf         (gamemode==14 || gamemode==15)
@@ -118,7 +120,7 @@ enum
 #define m_noprimary   (m_pistol || m_lss)
 #define m_noguns      (m_nopistol && m_noprimary)
 #define m_arena       (m_lms || m_lss || m_osok)
-#define m_teammode    (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11 || gamemode==13 || gamemode==14)
+#define m_teammode    (gamemode==0 || gamemode==4 || gamemode==5 || gamemode==7 || gamemode==11 || gamemode==13 || gamemode==14 || gamemode==16 || gamemode==17)
 #define m_tarena      (m_arena && m_teammode)
 #define m_botmode     (gamemode==7 || gamemode == 8 || gamemode==12)
 #define m_valid(mode) (((mode)>=0 && (mode)<GMODE_NUM) || (mode) == -1)