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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.96 by root, Thu Mar 15 14:23:02 2007 UTC vs.
Revision 1.102 by root, Thu May 17 21:32:08 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
174 * let the player through (inventory checkers for example) 174 * let the player through (inventory checkers for example)
175 */ 175 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 177 return 0;
178 178
179 if (ob->head != NULL)
180 ob = ob->head; 179 ob = ob->head_ ();
181 180
182 /* We basically go through the stack of objects, and if there is 181 /* We basically go through the stack of objects, and if there is
183 * some other object that has NO_PASS or FLAG_ALIVE set, return 182 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 183 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 184 * ob is blocking it, so return 0.
… …
215 else 214 else
216 { 215 {
217 /* Broke apart a big nasty if into several here to make 216 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 217 * this more readable. first check - if the space blocks
219 * movement, can't move here. 218 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 219 * second - if a monster, can't move there, unless it is a
221 * hidden dm 220 * hidden dm
222 */ 221 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 222 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 223 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 224
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 225 if (QUERY_FLAG (tmp, FLAG_ALIVE)
226 && tmp->head_ () != ob
227 && tmp != ob
228 && tmp->type != DOOR
229 && !tmp->flag [FLAG_WIZ]
230 && tmp->contr->hidden)
227 return 1; 231 return 1;
228 } 232 }
229 233
230 } 234 }
231 return 0; 235 return 0;
… …
344} 348}
345 349
346/* link_multipart_objects go through all the objects on the map looking 350/* link_multipart_objects go through all the objects on the map looking
347 * for objects whose arch says they are multipart yet according to the 351 * for objects whose arch says they are multipart yet according to the
348 * info we have, they only have the head (as would be expected when 352 * info we have, they only have the head (as would be expected when
349 * they are saved). We do have to look for the old maps that did save 353 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 354 */
352void 355void
353maptile::link_multipart_objects () 356maptile::link_multipart_objects ()
354{ 357{
355 if (!spaces) 358 if (!spaces)
356 return; 359 return;
357 360
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 361 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 362 for (object *op = ms->bot; op; op = op->above)
360 { 363 {
361 /* already multipart - don't do anything more */ 364 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 365 if (op->head_ () == op && !op->more && op->arch->more)
363 { 366 {
364 /* If there is nothing more to this object, this for loop 367 op->remove ();
365 * won't do anything. 368 op->expand_tail ();
366 */
367 archetype *at;
368 object *last, *op;
369 for (at = tmp->arch->more, last = tmp;
370 at;
371 at = at->more, last = op)
372 {
373 op = arch_to_object (at);
374
375 /* update x,y coordinates */
376 op->x += tmp->x;
377 op->y += tmp->y;
378 op->head = tmp;
379 op->map = this;
380 last->more = op;
381 op->name = tmp->name;
382 op->title = tmp->title;
383
384 /* we could link all the parts onto tmp, and then just
385 * call insert_ob_in_map once, but the effect is the same,
386 * as insert_ob_in_map will call itself with each part, and
387 * the coding is simpler to just to it here with each part.
388 */
389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 369 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
390 }
391 } 370 }
392 } 371 }
393} 372}
394 373
395/* 374/*
… …
399bool 378bool
400maptile::_load_objects (object_thawer &f) 379maptile::_load_objects (object_thawer &f)
401{ 380{
402 for (;;) 381 for (;;)
403 { 382 {
404 coroapi::cede_every (1000); // cede once in a while 383 coroapi::cede_to_tick_every (100); // cede once in a while
405 384
406 switch (f.kw) 385 switch (f.kw)
407 { 386 {
408 case KW_arch: 387 case KW_arch:
409 if (object *op = object::read (f, this)) 388 if (object *op = object::read (f, this))
… …
432} 411}
433 412
434void 413void
435maptile::activate () 414maptile::activate ()
436{ 415{
416 active = true;
417
437 if (!spaces) 418 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 419 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 420 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 421 op->activate_recursive ();
443} 422}
444 423
445void 424void
446maptile::deactivate () 425maptile::deactivate ()
447{ 426{
427 active = false;
428
448 if (!spaces) 429 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 430 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 431 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 432 op->deactivate_recursive ();
454} 433}
455 434
456bool 435bool
457maptile::_save_objects (object_freezer &f, int flags) 436maptile::_save_objects (object_freezer &f, int flags)
458{ 437{
459 static int cede_count = 0; 438 coroapi::cede_to_tick ();
460 439
461 if (flags & IO_HEADER) 440 if (flags & IO_HEADER)
462 _save_header (f); 441 _save_header (f);
463 442
464 if (!spaces) 443 if (!spaces)
465 return false; 444 return false;
466 445
467 for (int i = 0; i < size (); ++i) 446 for (int i = 0; i < size (); ++i)
468 { 447 {
469 if (cede_count >= 500)
470 {
471 cede_count = 0;
472 coroapi::cede ();
473 }
474
475 int unique = 0; 448 int unique = 0;
476 for (object *op = spaces [i].bot; op; op = op->above) 449 for (object *op = spaces [i].bot; op; op = op->above)
477 { 450 {
478 // count per-object, but cede only when modification-safe
479 cede_count++;
480
481 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 451 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
482 unique = 1; 452 unique = 1;
483 453
484 if (!op->can_map_save ()) 454 if (!op->can_map_save ())
485 continue; 455 continue;
… …
491 } 461 }
492 else if (flags & IO_OBJECTS) 462 else if (flags & IO_OBJECTS)
493 op->write (f); 463 op->write (f);
494 } 464 }
495 } 465 }
466
467 coroapi::cede_to_tick ();
496 468
497 return true; 469 return true;
498} 470}
499 471
500bool 472bool
… …
805 object *above = op->above; 777 object *above = op->above;
806 778
807 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 779 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
808 unique = 1; 780 unique = 1;
809 781
810 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 782 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
811 { 783 {
812 op->destroy_inv (false); 784 op->destroy_inv (false);
813 op->destroy (); 785 op->destroy ();
814 } 786 }
815 787
… …
898 free (regionmap), regionmap = 0; 870 free (regionmap), regionmap = 0;
899 871
900 if (spaces) 872 if (spaces)
901 { 873 {
902 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 874 for (mapspace *ms = spaces + size (); ms-- > spaces; )
903 while (object *op = ms->bot) 875 while (object *op = ms->bot->head_ ())
904 { 876 {
905 if (op->head)
906 op = op->head;
907
908 op->destroy_inv (false); 877 op->destroy_inv (false);
909 op->destroy (); 878 op->destroy ();
910 } 879 }
911 880
912 sfree (spaces, size ()), spaces = 0; 881 sfree (spaces, size ()), spaces = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines