ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.34 by root, Mon Jan 1 12:28:46 2007 UTC vs.
Revision 1.35 by root, Mon Jan 1 13:31:46 2007 UTC

199 199
200/* decay and destroy perishable items in a map */ 200/* decay and destroy perishable items in a map */
201void 201void
202maptile::decay_objects () 202maptile::decay_objects ()
203{ 203{
204 for (int x = 0; x < width; x++) 204 if (!spaces)
205 for (int y = 0; y < height; y++) 205 return;
206
207 for (mapspace *ms = spaces + size (); ms-- > spaces; )
206 for (object *above = 0, *op = at (x, y).bot; op; op = above) 208 for (object *above, *op = ms->bot; op; op = above)
207 { 209 {
208 bool destroy = 0;
209
210 above = op->above; 210 above = op->above;
211 211
212 bool destroy = 0;
213
212 // do not decay anything above unique floor tiles (yet :) 214 // do not decay anything above unique floor tiles (yet :)
213 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 215 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
214 break; 216 break;
215 217
216 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 218 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
217 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 219 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
218 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) 220 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
219 || QUERY_FLAG (op, FLAG_UNIQUE) 221 || QUERY_FLAG (op, FLAG_UNIQUE)
220 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 222 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
221 || QUERY_FLAG (op, FLAG_UNPAID) 223 || QUERY_FLAG (op, FLAG_UNPAID)
222 || op->is_alive ()) 224 || op->is_alive ())
223 ; // do not decay 225 ; // do not decay
224 else if (op->is_weapon ()) 226 else if (op->is_weapon ())
225 { 227 {
226 op->stats.dam--; 228 op->stats.dam--;
227 if (op->stats.dam < 0) 229 if (op->stats.dam < 0)
228 destroy = 1; 230 destroy = 1;
229 } 231 }
230 else if (op->is_armor ()) 232 else if (op->is_armor ())
231 { 233 {
232 op->stats.ac--; 234 op->stats.ac--;
233 if (op->stats.ac < 0) 235 if (op->stats.ac < 0)
234 destroy = 1; 236 destroy = 1;
235 } 237 }
236 else if (op->type == FOOD) 238 else if (op->type == FOOD)
237 { 239 {
238 op->stats.food -= rndm (5, 20); 240 op->stats.food -= rndm (5, 20);
239 if (op->stats.food < 0) 241 if (op->stats.food < 0)
240 destroy = 1; 242 destroy = 1;
241 } 243 }
242 else 244 else
243 { 245 {
244 int mat = op->material; 246 int mat = op->material;
245 247
246 if (mat & M_PAPER 248 if (mat & M_PAPER
247 || mat & M_LEATHER 249 || mat & M_LEATHER
248 || mat & M_WOOD 250 || mat & M_WOOD
249 || mat & M_ORGANIC 251 || mat & M_ORGANIC
250 || mat & M_CLOTH 252 || mat & M_CLOTH
251 || mat & M_LIQUID 253 || mat & M_LIQUID
252 || (mat & M_IRON && rndm (1, 5) == 1) 254 || (mat & M_IRON && rndm (1, 5) == 1)
253 || (mat & M_GLASS && rndm (1, 2) == 1) 255 || (mat & M_GLASS && rndm (1, 2) == 1)
254 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 256 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
255 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 257 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
256 || (mat & M_ICE && temp > 32)) 258 || (mat & M_ICE && temp > 32))
257 destroy = 1; 259 destroy = 1;
258 } 260 }
259 261
260 /* adjust overall chance below */ 262 /* adjust overall chance below */
261 if (destroy && rndm (0, 1)) 263 if (destroy && rndm (0, 1))
262 op->destroy (); 264 op->destroy ();
263 } 265 }
264} 266}
265 267
266/* convert materialname to materialtype_t */ 268/* convert materialname to materialtype_t */
267 269
268materialtype_t * 270materialtype_t *

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines