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.97 by root, Sat Mar 17 21:13:21 2007 UTC vs.
Revision 1.113 by root, Fri Jul 13 15:54:40 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <unistd.h> 24#include <unistd.h>
26 25
27#include "global.h" 26#include "global.h"
… …
174 * let the player through (inventory checkers for example) 173 * let the player through (inventory checkers for example)
175 */ 174 */
176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 175 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177 return 0; 176 return 0;
178 177
179 if (ob->head != NULL)
180 ob = ob->head; 178 ob = ob->head_ ();
181 179
182 /* We basically go through the stack of objects, and if there is 180 /* 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 181 * some other object that has NO_PASS or FLAG_ALIVE set, return
184 * true. If we get through the entire stack, that must mean 182 * true. If we get through the entire stack, that must mean
185 * ob is blocking it, so return 0. 183 * ob is blocking it, so return 0.
… …
215 else 213 else
216 { 214 {
217 /* Broke apart a big nasty if into several here to make 215 /* Broke apart a big nasty if into several here to make
218 * this more readable. first check - if the space blocks 216 * this more readable. first check - if the space blocks
219 * movement, can't move here. 217 * movement, can't move here.
220 * second - if a monster, can't move there, unles it is a 218 * second - if a monster, can't move there, unless it is a
221 * hidden dm 219 * hidden dm
222 */ 220 */
223 if (OB_MOVE_BLOCK (ob, tmp)) 221 if (OB_MOVE_BLOCK (ob, tmp))
224 return 1; 222 return 1;
225 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 223
226 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 224 if (tmp->flag [FLAG_ALIVE]
225 && tmp->head_ () != ob
226 && tmp != ob
227 && tmp->type != DOOR
228 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 229 return 1;
228 } 230 }
229 231
230 } 232 }
231 return 0; 233 return 0;
… …
273 275
274 /* don't have object, so don't know what types would block */ 276 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block; 277 return m1->at (sx, sy).move_block;
276 } 278 }
277 279
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 280 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279 { 281 {
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 282 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281 283
282 if (flag & P_OUT_OF_MAP) 284 if (flag & P_OUT_OF_MAP)
283 return P_OUT_OF_MAP; 285 return P_OUT_OF_MAP;
284 if (flag & P_IS_ALIVE) 286 if (flag & P_IS_ALIVE)
285 return P_IS_ALIVE; 287 return P_IS_ALIVE;
… …
344} 346}
345 347
346/* link_multipart_objects go through all the objects on the map looking 348/* 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 349 * 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 350 * 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 351 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 352 */
352void 353void
353maptile::link_multipart_objects () 354maptile::link_multipart_objects ()
354{ 355{
355 if (!spaces) 356 if (!spaces)
356 return; 357 return;
357 358
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 359 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 360 {
361 object *op = ms->bot;
362 while (op)
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 {
364 /* If there is nothing more to this object, this for loop
365 * won't do anything.
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 { 366 {
373 op = arch_to_object (at); 367 op->remove ();
368 op->expand_tail ();
374 369
375 /* update x,y coordinates */ 370 // FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
376 op->x += tmp->x; 371 // multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
377 op->y += tmp->y; 372 // below the pentagrams... hopefully INS_ON_TOP doesn't break anything
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); 373 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ON_TOP | INS_NO_WALK_ON);
374
375 op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
376 // so we have to reset the iteration through the mapspace
390 } 377 }
378 else
379 op = op->above;
391 } 380 }
392 } 381 }
393} 382}
394 383
395/* 384/*
396 * Loads (ands parses) the objects into a given map from the specified 385 * Loads (ands parses) the objects into a given map from the specified
397 * file pointer. 386 * file pointer.
… …
399bool 388bool
400maptile::_load_objects (object_thawer &f) 389maptile::_load_objects (object_thawer &f)
401{ 390{
402 for (;;) 391 for (;;)
403 { 392 {
404 coroapi::cede_every (1000); // cede once in a while 393 coroapi::cede_to_tick_every (100); // cede once in a while
405 394
406 switch (f.kw) 395 switch (f.kw)
407 { 396 {
408 case KW_arch: 397 case KW_arch:
409 if (object *op = object::read (f, this)) 398 if (object *op = object::read (f, this))
… …
432} 421}
433 422
434void 423void
435maptile::activate () 424maptile::activate ()
436{ 425{
426 active = true;
427
437 if (!spaces) 428 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 429 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 430 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 431 op->activate_recursive ();
443} 432}
444 433
445void 434void
446maptile::deactivate () 435maptile::deactivate ()
447{ 436{
437 active = false;
438
448 if (!spaces) 439 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 440 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 441 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 442 op->deactivate_recursive ();
454} 443}
455 444
456bool 445bool
457maptile::_save_objects (object_freezer &f, int flags) 446maptile::_save_objects (object_freezer &f, int flags)
458{ 447{
459 coroapi::cede (); 448 coroapi::cede_to_tick ();
460 449
461 if (flags & IO_HEADER) 450 if (flags & IO_HEADER)
462 _save_header (f); 451 _save_header (f);
463 452
464 if (!spaces) 453 if (!spaces)
465 return false; 454 return false;
466 455
467 for (int i = 0; i < size (); ++i) 456 for (int i = 0; i < size (); ++i)
468 { 457 {
469#if 0 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
472 if (cede_count >= 500)
473 {
474 cede_count = 0;
475 coroapi::cede ();
476 }
477#endif
478
479 int unique = 0; 458 int unique = 0;
480 for (object *op = spaces [i].bot; op; op = op->above) 459 for (object *op = spaces [i].bot; op; op = op->above)
481 { 460 {
482 // count per-object, but cede only when modification-safe
483 cede_count++;
484
485 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 461 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
486 unique = 1; 462 unique = 1;
487 463
488 if (!op->can_map_save ()) 464 if (!op->can_map_save ())
489 continue; 465 continue;
… …
496 else if (flags & IO_OBJECTS) 472 else if (flags & IO_OBJECTS)
497 op->write (f); 473 op->write (f);
498 } 474 }
499 } 475 }
500 476
501 coroapi::cede (); 477 coroapi::cede_to_tick ();
502 478
503 return true; 479 return true;
504} 480}
505 481
506bool 482bool
… …
705bool 681bool
706maptile::_load_header (object_thawer &thawer) 682maptile::_load_header (object_thawer &thawer)
707{ 683{
708 for (;;) 684 for (;;)
709 { 685 {
710 keyword kw = thawer.get_kv (); 686 thawer.next ();
711 687
712 switch (kw) 688 switch (thawer.kw)
713 { 689 {
714 case KW_msg: 690 case KW_msg:
715 thawer.get_ml (KW_endmsg, msg); 691 thawer.get_ml (KW_endmsg, msg);
716 break; 692 break;
717 693
… …
749 case KW_winddir: thawer.get (winddir); break; 725 case KW_winddir: thawer.get (winddir); break;
750 case KW_sky: thawer.get (sky); break; 726 case KW_sky: thawer.get (sky); break;
751 727
752 case KW_per_player: thawer.get (per_player); break; 728 case KW_per_player: thawer.get (per_player); break;
753 case KW_per_party: thawer.get (per_party); break; 729 case KW_per_party: thawer.get (per_party); break;
730 case KW_no_reset: thawer.get (no_reset); break;
754 731
755 case KW_region: default_region = region::find (thawer.get_str ()); break; 732 case KW_region: default_region = region::find (thawer.get_str ()); break;
756 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 733 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
757 734
758 // old names new names 735 // old names new names
… …
769 case KW_tile_path_1: thawer.get (tile_path [0]); break; 746 case KW_tile_path_1: thawer.get (tile_path [0]); break;
770 case KW_tile_path_2: thawer.get (tile_path [1]); break; 747 case KW_tile_path_2: thawer.get (tile_path [1]); break;
771 case KW_tile_path_3: thawer.get (tile_path [2]); break; 748 case KW_tile_path_3: thawer.get (tile_path [2]); break;
772 case KW_tile_path_4: thawer.get (tile_path [3]); break; 749 case KW_tile_path_4: thawer.get (tile_path [3]); break;
773 750
751 case KW_ERROR:
752 set_key (thawer.kw_str, thawer.value);
753 break;
754
774 case KW_end: 755 case KW_end:
775 return true; 756 return true;
776 757
777 default: 758 default:
778 if (!thawer.parse_error ("map", 0)) 759 if (!thawer.parse_error ("map", 0))
… …
811 object *above = op->above; 792 object *above = op->above;
812 793
813 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 794 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
814 unique = 1; 795 unique = 1;
815 796
816 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 797 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
817 { 798 {
818 op->destroy_inv (false); 799 op->destroy_inv (false);
819 op->destroy (); 800 op->destroy ();
820 } 801 }
821 802
… …
835 if (name) MAP_OUT (name); 816 if (name) MAP_OUT (name);
836 MAP_OUT (swap_time); 817 MAP_OUT (swap_time);
837 MAP_OUT (reset_time); 818 MAP_OUT (reset_time);
838 MAP_OUT (reset_timeout); 819 MAP_OUT (reset_timeout);
839 MAP_OUT (fixed_resettime); 820 MAP_OUT (fixed_resettime);
821 MAP_OUT (no_reset);
840 MAP_OUT (difficulty); 822 MAP_OUT (difficulty);
841 823
842 if (default_region) MAP_OUT2 (region, default_region->name); 824 if (default_region) MAP_OUT2 (region, default_region->name);
843 825
844 if (shopitems) 826 if (shopitems)
… …
898 * Remove and free all objects in the given map. 880 * Remove and free all objects in the given map.
899 */ 881 */
900void 882void
901maptile::clear () 883maptile::clear ()
902{ 884{
903 sfree (regions, size ()), regions = 0; 885 sfree (regions, size ()); regions = 0;
904 free (regionmap), regionmap = 0; 886 delete [] regionmap; regionmap = 0;
905 887
906 if (spaces) 888 if (spaces)
907 { 889 {
908 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 890 for (mapspace *ms = spaces + size (); ms-- > spaces; )
909 while (object *op = ms->bot) 891 while (object *op = ms->bot)
910 { 892 {
911 if (op->head)
912 op = op->head; 893 op = op->head_ ();
913
914 op->destroy_inv (false); 894 op->destroy_inv (false);
915 op->destroy (); 895 op->destroy ();
916 } 896 }
917 897
918 sfree (spaces, size ()), spaces = 0; 898 sfree (spaces, size ()), spaces = 0;
… …
957maptile::do_destroy () 937maptile::do_destroy ()
958{ 938{
959 attachable::do_destroy (); 939 attachable::do_destroy ();
960 940
961 clear (); 941 clear ();
942}
943
944/* decay and destroy perishable items in a map */
945void
946maptile::do_decay_objects ()
947{
948 if (!spaces)
949 return;
950
951 for (mapspace *ms = spaces + size (); ms-- > spaces; )
952 for (object *above, *op = ms->bot; op; op = above)
953 {
954 above = op->above;
955
956 bool destroy = 0;
957
958 // do not decay anything above unique floor tiles (yet :)
959 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
960 break;
961
962 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
963 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
964 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
965 || QUERY_FLAG (op, FLAG_UNIQUE)
966 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
967 || QUERY_FLAG (op, FLAG_UNPAID)
968 || op->is_alive ())
969 ; // do not decay
970 else if (op->is_weapon ())
971 {
972 op->stats.dam--;
973 if (op->stats.dam < 0)
974 destroy = 1;
975 }
976 else if (op->is_armor ())
977 {
978 op->stats.ac--;
979 if (op->stats.ac < 0)
980 destroy = 1;
981 }
982 else if (op->type == FOOD)
983 {
984 op->stats.food -= rndm (5, 20);
985 if (op->stats.food < 0)
986 destroy = 1;
987 }
988 else
989 {
990 int mat = op->materials;
991
992 if (mat & M_PAPER
993 || mat & M_LEATHER
994 || mat & M_WOOD
995 || mat & M_ORGANIC
996 || mat & M_CLOTH
997 || mat & M_LIQUID
998 || (mat & M_IRON && rndm (1, 5) == 1)
999 || (mat & M_GLASS && rndm (1, 2) == 1)
1000 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
1001 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
1002 || (mat & M_ICE && temp > 32))
1003 destroy = 1;
1004 }
1005
1006 /* adjust overall chance below */
1007 if (destroy && rndm (0, 1))
1008 op->destroy ();
1009 }
962} 1010}
963 1011
964/* 1012/*
965 * Updates every button on the map (by calling update_button() for them). 1013 * Updates every button on the map (by calling update_button() for them).
966 */ 1014 */
… …
1014 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1062 if (QUERY_FLAG (op, FLAG_GENERATOR))
1015 { 1063 {
1016 total_exp += op->stats.exp; 1064 total_exp += op->stats.exp;
1017 1065
1018 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1066 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1019 total_exp += at->clone.stats.exp * 8; 1067 total_exp += at->stats.exp * 8;
1020 1068
1021 monster_cnt++; 1069 monster_cnt++;
1022 } 1070 }
1023 } 1071 }
1024 1072

Diff Legend

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