--- deliantra/server/common/map.C	2009/11/11 23:27:56	1.177
+++ deliantra/server/common/map.C	2009/11/29 09:41:27	1.178
@@ -632,12 +632,6 @@
           case KW_shopmax:    thawer.get (shopmax);    break;
           case KW_shoprace:   thawer.get (shoprace);   break;
           case KW_outdoor:    thawer.get (outdoor);    break;
-          case KW_temp:       thawer.get (temp);       break;
-          case KW_pressure:   thawer.get (pressure);   break;
-          case KW_humid:      thawer.get (humid);      break;
-          case KW_windspeed:  thawer.get (windspeed);  break;
-          case KW_winddir:    thawer.get (winddir);    break;
-          case KW_sky:        thawer.get (sky);        break;
 
           case KW_per_player: thawer.get (per_player); break;
           case KW_per_party:  thawer.get (per_party);  break;
@@ -737,23 +731,16 @@
   MAP_OUT (shopmax);
   if (shoprace) MAP_OUT (shoprace);
 
-  MAP_OUT (darkness);
   MAP_OUT (width);
   MAP_OUT (height);
   MAP_OUT (enter_x);
   MAP_OUT (enter_y);
+  MAP_OUT (darkness);
+  MAP_OUT (outdoor);
 
   if (msg)     freezer.put (KW(msg)    , KW(endmsg)    , msg);
   if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
 
-  MAP_OUT (outdoor);
-  MAP_OUT (temp);
-  MAP_OUT (pressure);
-  MAP_OUT (humid);
-  MAP_OUT (windspeed);
-  MAP_OUT (winddir);
-  MAP_OUT (sky);
-
   MAP_OUT (per_player);
   MAP_OUT (per_party);
 
@@ -858,6 +845,7 @@
 }
 
 /* decay and destroy perishable items in a map */
+// TODO: should be done regularly, not on map load?
 void
 maptile::do_decay_objects ()
 {
@@ -914,7 +902,8 @@
                 || (mat & M_GLASS && rndm (1, 2) == 1)
                 || ((mat & M_STONE      || mat & M_ADAMANT) && rndm (1, 10) == 1)
                 || ((mat & M_SOFT_METAL || mat & M_BONE)    && rndm (1, 3)  == 1)
-                || (mat & M_ICE && temp > 32))
+                //|| (mat & M_ICE && temp > 32)
+               )
               destroy = 1;
           }