--- deliantra/Deliantra-Client/Client.xs	2012/01/18 23:34:44	1.315
+++ deliantra/Deliantra-Client/Client.xs	2012/11/04 02:13:53	1.316
@@ -2034,7 +2034,7 @@
 }
 
 SV *
-map1a_update (DC::Map self, SV *data_, int extmap)
+map1a_update (DC::Map self, SV *data_)
 	CODE:
 {
         uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
@@ -2065,44 +2065,39 @@
 
                 if (flags & 8)
                   {
-                    if (extmap)
+                    uint8_t ext, cmd;
+
+                    do
                       {
-                        uint8_t ext, cmd;
+                        ext = *data++;
+                        cmd = ext & 0x7f;
 
-                        do
+                        if (cmd < 4)
+                          cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
+                        else if (cmd == 5) // health
+                          {
+                            cell->stat_width = 1;
+                            cell->stat_hp = *data++;
+                          }
+                        else if (cmd == 6) // monster width
+                          cell->stat_width = *data++ + 1;
+                        else if (cmd == 0x47)
                           {
-                            ext = *data++;
-                            cmd = ext & 0x7f;
+                            if      (*data == 1) cell->player = data [1];
+                            else if (*data == 2) cell->player = data [2] + (data [1] << 8);
+                            else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
+                            else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
 
-                            if (cmd < 4)
-                              cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
-                            else if (cmd == 5) // health
-                              {
-                                cell->stat_width = 1;
-                                cell->stat_hp = *data++;
-                              }
-                            else if (cmd == 6) // monster width
-                              cell->stat_width = *data++ + 1;
-                            else if (cmd == 0x47)
-                              {
-                                if      (*data == 1) cell->player = data [1];
-                                else if (*data == 2) cell->player = data [2] + (data [1] << 8);
-                                else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
-                                else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
-
-                                data += *data + 1;
-                              }
-                            else if (cmd == 8) // cell flags
-                              cell->flags = *data++;
-                            else if (ext & 0x40) // unknown, multibyte => skip
-                              data += *data + 1;
-                            else
-                              data++;
+                            data += *data + 1;
                           }
-                        while (ext & 0x80);
+                        else if (cmd == 8) // cell flags
+                          cell->flags = *data++;
+                        else if (ext & 0x40) // unknown, multibyte => skip
+                          data += *data + 1;
+                        else
+                          data++;
                       }
-                    else
-                      cell->darkness = *data++ + 1;
+                    while (ext & 0x80);
                   }
 
                 for (z = 0; z <= 2; ++z)