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.31 by root, Mon Dec 25 14:54:44 2006 UTC vs.
Revision 1.34 by root, Mon Jan 1 12:28:46 2007 UTC

195 return (min); 195 return (min);
196 196
197 return (RANDOM () % diff + min); 197 return (RANDOM () % diff + min);
198} 198}
199 199
200/* decay and destroy persihable items in a map */ 200/* decay and destroy perishable items in a map */
201
202void 201void
203decay_objects (maptile *m) 202maptile::decay_objects ()
204{ 203{
205 int x, y, destroy;
206 object *op, *otmp;
207
208 if (m->unique)
209 return;
210
211 for (x = 0; x < m->width; x++) 204 for (int x = 0; x < width; x++)
212 for (y = 0; y < m->height; y++) 205 for (int y = 0; y < height; y++)
213 for (op = GET_MAP_OB (m, x, y); op; op = otmp) 206 for (object *above = 0, *op = at (x, y).bot; op; op = above)
214 { 207 {
215 destroy = 0; 208 bool destroy = 0;
209
216 otmp = op->above; 210 above = op->above;
211
212 // do not decay anything above unique floor tiles (yet :)
217 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 213 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
218 break; 214 break;
215
219 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 216 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
220 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 217 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
221 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) 218 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
222 || QUERY_FLAG (op, FLAG_UNIQUE) 219 || QUERY_FLAG (op, FLAG_UNIQUE)
223 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 220 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
224 || QUERY_FLAG (op, FLAG_UNPAID) 221 || QUERY_FLAG (op, FLAG_UNPAID)
225 || op->is_alive ()) 222 || op->is_alive ())
226 continue; 223 ; // do not decay
227
228 /* otherwise, we decay and destroy */
229 if (op->is_weapon ()) 224 else if (op->is_weapon ())
230 { 225 {
231 op->stats.dam--; 226 op->stats.dam--;
232 if (op->stats.dam < 0) 227 if (op->stats.dam < 0)
233 destroy = 1; 228 destroy = 1;
234 } 229 }
244 if (op->stats.food < 0) 239 if (op->stats.food < 0)
245 destroy = 1; 240 destroy = 1;
246 } 241 }
247 else 242 else
248 { 243 {
249 if (op->material & M_PAPER || op->material & M_LEATHER || 244 int mat = op->material;
250 op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) 245
251 destroy = 1; 246 if (mat & M_PAPER
247 || mat & M_LEATHER
248 || mat & M_WOOD
249 || mat & M_ORGANIC
250 || mat & M_CLOTH
251 || mat & M_LIQUID
252 if (op->material & M_IRON && rndm (1, 5) == 1) 252 || (mat & M_IRON && rndm (1, 5) == 1)
253 destroy = 1;
254 if (op->material & M_GLASS && rndm (1, 2) == 1) 253 || (mat & M_GLASS && rndm (1, 2) == 1)
255 destroy = 1;
256 if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1) 254 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
257 destroy = 1;
258 if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1) 255 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
259 destroy = 1;
260 if (op->material & M_ICE && m->temp > 32) 256 || (mat & M_ICE && temp > 32))
261 destroy = 1; 257 destroy = 1;
262 } 258 }
259
263 /* adjust overall chance below */ 260 /* adjust overall chance below */
264 if (destroy && rndm (0, 1)) 261 if (destroy && rndm (0, 1))
265 op->destroy (); 262 op->destroy ();
266 } 263 }
267} 264}
598 595
599 gettimeofday (&tv, 0); 596 gettimeofday (&tv, 0);
600 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6); 597 return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
601} 598}
602 599
600int
601similar_direction (int a, int b)
602{
603 if (!a || !b)
604 return 0;
605
606 int diff = (b - a) & 7;
607 return diff <= 1 || diff >= 7;
608}
609

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines