patch from Niko Böhm, fixes player count after several /move commands.

diff --git a/AUTHORS b/AUTHORS
index a40c47f152b6707fc168edf7387881aa780381b1..a86b60c6f8c2114ced312f70752531fa54e33995 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Neil Bird
 Pihvi
 Jordi Mallach
 Bastien Nocera
+Niko Böhm
 James Antill
 Steve Kemp
 Gerfried Fuchs

diff --git a/ChangeLog b/ChangeLog
index 8abfecfd643bffe98485f06de18fb5052aff85da..93698357da3567f483dc6b1a2d4f461996377128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-03  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/tetrinet.c (tetrinet_inmessage): patch from Niko Böhm, fixes
+       player count after several /move commands.
+
+       * AUTHORS: added Niko.
+
 2002-12-02  James Antill  <james@and.org>
 
        * src/misc.c (adjust_bottom_text_view): Change function API to work on

diff --git a/src/tetrinet.c b/src/tetrinet.c
index 3350e7fcba8f4a73f18fc4022b93e9c0e4d1eb69..24566653367840f0ae406cb624b6e8ea8e4af087 100644 (file)
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -231,7 +231,7 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
             /* set up stuff */
             connected = TRUE;
             ingame = playing = paused = FALSE;
-            playercount = spectating ? 0 : 1;
+            playercount = 0;
             partyline_text ("\014\02*** Connected to server");
             commands_checkstate ();
             connectingdialog_destroy ();
@@ -240,6 +240,9 @@ void tetrinet_inmessage (enum inmsg_type msgtype, char *data)
             else tetrix = FALSE;
         }
         if (!spectating) {
+            /* If we occupy a previously empty slot increase playercount */
+            if (playernames[playernum][0] == 0)
+                playercount++;
             /* set own player/team info */
             GTET_O_STRCPY (playernames[playernum], nick);
             GTET_O_STRCPY (teamnames[playernum], team);