csl-svn/justice.patch

   1 --- src/CslListCtrlPlayer.cpp   2010-09-12 18:47:22.000000000 +0200
   2 +++ src/CslListCtrlPlayer.cpp   2010-07-20 15:52:32.000000000 +0200
   3 @@ -110,9 +110,13 @@
   4          s+=info->GameMode+_(" on ");
   5      if (!info->Map.IsEmpty())
   6          s+=info->Map+wxT(" ");
   7 -    if (info->TimeRemain>0)
   8 -        s+=wxString::Format(wxT("(< %d %s)"),info->TimeRemain,info->TimeRemain==1 ?
   9 -                            _("Minute"):_("Minutes"))+wxT(" ");
  10 +
  11 +       if (info->TimeRemain>0)
  12 +               if (info->Protocol >= 258)
  13 +                       s+=wxString::Format(wxT("%s"), FormatSeconds(info->TimeRemain).c_str())+wxT(" ");
  14 +               else
  15 +                       s+=wxString::Format(wxT("(< %d %s)"),info->TimeRemain,info->TimeRemain==1 ?
  16 +                                                               _("Minute"):_("Minutes"))+wxT(" ");
  17      s.Replace(wxT("&"),wxT("&&"));
  18
  19      return s;
  20 --- src/engine/CslExtendedInfo.h        2010-09-12 18:47:20.000000000 +0200
  21 +++ src/engine/CslExtendedInfo.h        2010-07-20 09:53:16.000000000 +0200
  22 @@ -26,7 +26,7 @@
  23  */
  24
  25  #define CSL_EX_VERSION_MIN      102
  26 -#define CSL_EX_VERSION_MAX      104
  27 +#define CSL_EX_VERSION_MAX      105
  28  // commands
  29  #define CSL_EX_PING_UPTIME      0
  30  #define CSL_EX_PING_PLAYERSTATS 1
  31 --- src/engine/CslGameSauerbraten.cpp   2010-09-12 18:47:20.000000000 +0200
  32 +++ src/engine/CslGameSauerbraten.cpp   2010-07-20 15:42:38.000000000 +0200
  33 @@ -53,7 +53,7 @@
  34  {
  35      static const wxChar* versions[] =
  36      {
  37 -        wxT("Trooper"),wxT("CTF"),wxT("Assassin"),wxT("Summer"),
  38 +        wxT("Justice"),wxT("Trooper"),wxT("CTF"),wxT("Assassin"),wxT("Summer"),
  39          wxT("Spring"),wxT("Gui"),wxT("Water"),wxT("Normalmap"),
  40          wxT("Sp"),wxT("Occlusion"),wxT("Shader"),wxT("Physics"),
  41          wxT("Mp"),wxT(""),wxT("Agc"),wxT("Quakecon"),wxT("Independence")
  42 @@ -92,7 +92,7 @@
  43              wxT("ffa"),wxT("coop edit"),wxT("teamplay"),wxT("instagib"),wxT("instagib team"),
  44              wxT("efficiency"),wxT("efficiency team"),wxT("tactics"),wxT("tactics team"),
  45              wxT("capture"),wxT("regen capture"),wxT("ctf"),wxT("insta ctf"),
  46 -            wxT("protect"),wxT("insta protect")
  47 +            wxT("protect"),wxT("insta protect"),wxT("hold"),wxT("insta hold"),wxT("efficiency ctf"),wxT("efficiency protect"),wxT("efficiency hold")
  48          };
  49          return (mode>=0 && (size_t)mode<sizeof(modes)/sizeof(modes[0])) ?
  50                 modes[mode] : T2C(_("unknown"));
  51 @@ -188,6 +188,12 @@
  52      if (numattr>=3)
  53      {
  54          info.TimeRemain=attr[2];
  55 +               if (info.Protocol >= 258) {
  56 +                       int time = info.TimeRemain;
  57 +                       info.TimeRemain = info.TimeRemain/60;
  58 +                       if (time > 0)
  59 +                                       info.TimeRemain++;
  60 +               }
  61          if (info.Protocol<254)
  62              info.TimeRemain++;
  63      }
  64 --- src/engine/CslGameSauerbraten.h     2010-09-12 18:47:20.000000000 +0200
  65 +++ src/engine/CslGameSauerbraten.h     2010-07-20 09:58:04.000000000 +0200
  66 @@ -26,7 +26,7 @@
  67  */
  68
  69  #define CSL_DEFAULT_NAME_SB           wxT("Sauerbraten")
  70 -#define CSL_LAST_PROTOCOL_SB          257
  71 +#define CSL_LAST_PROTOCOL_SB          258
  72
  73  #define CSL_DEFAULT_PORT_SB           28785
  74