From 55a04c8cffb2d70312edea4afa39706074aec265 Mon Sep 17 00:00:00 2001 From: Bukz Date: Tue, 29 May 2012 21:31:43 +0000 Subject: [PATCH] fixes/MAXCL reduced to 16/protocol bump git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6813 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/scripts.cfg | 2 +- source/src/command.cpp | 3 +++ source/src/cube.h | 2 +- source/src/protocol.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/scripts.cfg b/config/scripts.cfg index bd8fcbcf..aa9262d7 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -107,7 +107,7 @@ const changeteam [ if (< (curteam) 4) [ team (at "RVSF CLA RVSF-SPECT CLA-SPECT" const WEAPONS "KNIFE PISTOL CARBINE SHOTGUN SMG SNIPER AR CPISTOL GRENADES AKIMBO" const NUM_WEAPONS (listlen $WEAPONS) const MODES "tdm coop dm surv ts ctf pf btdm bdm lss osok tosok bosok htf tktf ktf tpf tlss bpf blss bts btosok" -const NUM_MODES (listlen $NUM_MODES) +const NUM_MODES (listlen $MODES) // ktf ac_mines - calls a vote for keep the flag ac_mines // echo (ktf -1) = returns 15 diff --git a/source/src/command.cpp b/source/src/command.cpp index 27108d6a..5fc52676 100644 --- a/source/src/command.cpp +++ b/source/src/command.cpp @@ -1263,6 +1263,9 @@ void testchar(char *s, char *type) case 7: if(isspace(s[0]) != 0) { intret(1); return; } break; + case 8: // Without this it is impossible to determine if a character === " in cubescript + if(!strcmp(s, "\"")) { intret(1); return; } + break; default: if(isdigit(s[0]) != 0) { intret(1); return; } break; diff --git a/source/src/cube.h b/source/src/cube.h index 4d2e83fb..827b951d 100644 --- a/source/src/cube.h +++ b/source/src/cube.h @@ -54,7 +54,7 @@ extern int verbose; #define AC_VERSION 1111 #define AC_MASTER_URI "assault.cubers.net" #define AC_MASTER_PORT 28760 -#define MAXCL 20 +#define MAXCL 16 #include "protos.h" // external function decls diff --git a/source/src/protocol.h b/source/src/protocol.h index 6c6f8d94..9891d377 100644 --- a/source/src/protocol.h +++ b/source/src/protocol.h @@ -5,7 +5,7 @@ #define CUBE_SERVINFO_PORT_LAN 28762 #define CUBE_SERVINFO_PORT(serverport) (serverport+1) #define CUBE_SERVINFO_TO_SERV_PORT(servinfoport) (servinfoport-1) -#define PROTOCOL_VERSION 1142 // bump when protocol changes (use negative numbers for mods!) +#define PROTOCOL_VERSION 1143 // bump when protocol changes (use negative numbers for mods!) #define DEMO_VERSION 2 // bump when demo format changes #define DEMO_MAGIC "ASSAULTCUBE_DEMO" #define DEMO_MINTIME 10000 // don't keep demo recordings with less than 10 seconds