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.95 by root, Thu Mar 15 13:19:37 2007 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
… …
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 (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob
227 && tmp != ob
228 && tmp->type != DOOR
229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227 return 1; 230 return 1;
228 } 231 }
229 232
230 } 233 }
231 return 0; 234 return 0;
… …
273 276
274 /* don't have object, so don't know what types would block */ 277 /* don't have object, so don't know what types would block */
275 return m1->at (sx, sy).move_block; 278 return m1->at (sx, sy).move_block;
276 } 279 }
277 280
278 for (tmp = ob->arch; tmp; tmp = tmp->more) 281 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279 { 282 {
280 flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy); 283 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281 284
282 if (flag & P_OUT_OF_MAP) 285 if (flag & P_OUT_OF_MAP)
283 return P_OUT_OF_MAP; 286 return P_OUT_OF_MAP;
284 if (flag & P_IS_ALIVE) 287 if (flag & P_IS_ALIVE)
285 return P_IS_ALIVE; 288 return P_IS_ALIVE;
… …
344} 347}
345 348
346/* link_multipart_objects go through all the objects on the map looking 349/* 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 350 * 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 351 * 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 352 * they are saved).
350 * the more sections and not re-add sections for them.
351 */ 353 */
352void 354void
353maptile::link_multipart_objects () 355maptile::link_multipart_objects ()
354{ 356{
355 if (!spaces) 357 if (!spaces)
356 return; 358 return;
357 359
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 360 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 361 for (object *op = ms->bot; op; op = op->above)
360 { 362 {
361 /* already multipart - don't do anything more */ 363 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 364 if (op->head_ () == op && !op->more && op->arch->more)
363 { 365 {
364 /* If there is nothing more to this object, this for loop 366 op->remove ();
365 * won't do anything. 367 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); 368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
390 }
391 } 369 }
392 } 370 }
393} 371}
394 372
395/* 373/*
… …
399bool 377bool
400maptile::_load_objects (object_thawer &f) 378maptile::_load_objects (object_thawer &f)
401{ 379{
402 for (;;) 380 for (;;)
403 { 381 {
404 coroapi::cede_every (1000); // cede once in a while 382 coroapi::cede_to_tick_every (100); // cede once in a while
405 383
406 switch (f.kw) 384 switch (f.kw)
407 { 385 {
408 case KW_arch: 386 case KW_arch:
409 if (object *op = object::read (f, this)) 387 if (object *op = object::read (f, this))
… …
432} 410}
433 411
434void 412void
435maptile::activate () 413maptile::activate ()
436{ 414{
415 active = true;
416
437 if (!spaces) 417 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 418 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 419 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 420 op->activate_recursive ();
443} 421}
444 422
445void 423void
446maptile::deactivate () 424maptile::deactivate ()
447{ 425{
426 active = false;
427
448 if (!spaces) 428 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 429 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 430 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 431 op->deactivate_recursive ();
454} 432}
455 433
456bool 434bool
457maptile::_save_objects (object_freezer &f, int flags) 435maptile::_save_objects (object_freezer &f, int flags)
458{ 436{
459 static int cede_count = 0; 437 coroapi::cede_to_tick ();
460 438
461 if (flags & IO_HEADER) 439 if (flags & IO_HEADER)
462 _save_header (f); 440 _save_header (f);
463 441
464 if (!spaces) 442 if (!spaces)
465 return false; 443 return false;
466 444
467 for (int i = 0; i < size (); ++i) 445 for (int i = 0; i < size (); ++i)
468 { 446 {
469#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
470 if (cede_count >= 500)
471 {
472 cede_count = 0;
473 coroapi::cede ();
474 }
475#endif
476
477 int unique = 0; 447 int unique = 0;
478 for (object *op = spaces [i].bot; op; op = op->above) 448 for (object *op = spaces [i].bot; op; op = op->above)
479 { 449 {
480 // count per-object, but cede only when modification-safe
481 cede_count++;
482
483 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 450 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
484 unique = 1; 451 unique = 1;
485 452
486 if (!op->can_map_save ()) 453 if (!op->can_map_save ())
487 continue; 454 continue;
… …
493 } 460 }
494 else if (flags & IO_OBJECTS) 461 else if (flags & IO_OBJECTS)
495 op->write (f); 462 op->write (f);
496 } 463 }
497 } 464 }
465
466 coroapi::cede_to_tick ();
498 467
499 return true; 468 return true;
500} 469}
501 470
502bool 471bool
… …
701bool 670bool
702maptile::_load_header (object_thawer &thawer) 671maptile::_load_header (object_thawer &thawer)
703{ 672{
704 for (;;) 673 for (;;)
705 { 674 {
706 keyword kw = thawer.get_kv (); 675 thawer.next ();
707 676
708 switch (kw) 677 switch (thawer.kw)
709 { 678 {
710 case KW_msg: 679 case KW_msg:
711 thawer.get_ml (KW_endmsg, msg); 680 thawer.get_ml (KW_endmsg, msg);
712 break; 681 break;
713 682
… …
745 case KW_winddir: thawer.get (winddir); break; 714 case KW_winddir: thawer.get (winddir); break;
746 case KW_sky: thawer.get (sky); break; 715 case KW_sky: thawer.get (sky); break;
747 716
748 case KW_per_player: thawer.get (per_player); break; 717 case KW_per_player: thawer.get (per_player); break;
749 case KW_per_party: thawer.get (per_party); break; 718 case KW_per_party: thawer.get (per_party); break;
719 case KW_no_reset: thawer.get (no_reset); break;
750 720
751 case KW_region: default_region = region::find (thawer.get_str ()); break; 721 case KW_region: default_region = region::find (thawer.get_str ()); break;
752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
753 723
754 // old names new names 724 // old names new names
… …
807 object *above = op->above; 777 object *above = op->above;
808 778
809 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))
810 unique = 1; 780 unique = 1;
811 781
812 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 782 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
813 { 783 {
814 op->destroy_inv (false); 784 op->destroy_inv (false);
815 op->destroy (); 785 op->destroy ();
816 } 786 }
817 787
… …
831 if (name) MAP_OUT (name); 801 if (name) MAP_OUT (name);
832 MAP_OUT (swap_time); 802 MAP_OUT (swap_time);
833 MAP_OUT (reset_time); 803 MAP_OUT (reset_time);
834 MAP_OUT (reset_timeout); 804 MAP_OUT (reset_timeout);
835 MAP_OUT (fixed_resettime); 805 MAP_OUT (fixed_resettime);
806 MAP_OUT (no_reset);
836 MAP_OUT (difficulty); 807 MAP_OUT (difficulty);
837 808
838 if (default_region) MAP_OUT2 (region, default_region->name); 809 if (default_region) MAP_OUT2 (region, default_region->name);
839 810
840 if (shopitems) 811 if (shopitems)
… …
902 if (spaces) 873 if (spaces)
903 { 874 {
904 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 875 for (mapspace *ms = spaces + size (); ms-- > spaces; )
905 while (object *op = ms->bot) 876 while (object *op = ms->bot)
906 { 877 {
907 if (op->head)
908 op = op->head; 878 op = op->head_ ();
909
910 op->destroy_inv (false); 879 op->destroy_inv (false);
911 op->destroy (); 880 op->destroy ();
912 } 881 }
913 882
914 sfree (spaces, size ()), spaces = 0; 883 sfree (spaces, size ()), spaces = 0;
… …
953maptile::do_destroy () 922maptile::do_destroy ()
954{ 923{
955 attachable::do_destroy (); 924 attachable::do_destroy ();
956 925
957 clear (); 926 clear ();
927}
928
929/* decay and destroy perishable items in a map */
930void
931maptile::do_decay_objects ()
932{
933 if (!spaces)
934 return;
935
936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
937 for (object *above, *op = ms->bot; op; op = above)
938 {
939 above = op->above;
940
941 bool destroy = 0;
942
943 // do not decay anything above unique floor tiles (yet :)
944 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
945 break;
946
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ())
954 ; // do not decay
955 else if (op->is_weapon ())
956 {
957 op->stats.dam--;
958 if (op->stats.dam < 0)
959 destroy = 1;
960 }
961 else if (op->is_armor ())
962 {
963 op->stats.ac--;
964 if (op->stats.ac < 0)
965 destroy = 1;
966 }
967 else if (op->type == FOOD)
968 {
969 op->stats.food -= rndm (5, 20);
970 if (op->stats.food < 0)
971 destroy = 1;
972 }
973 else
974 {
975 int mat = op->materials;
976
977 if (mat & M_PAPER
978 || mat & M_LEATHER
979 || mat & M_WOOD
980 || mat & M_ORGANIC
981 || mat & M_CLOTH
982 || mat & M_LIQUID
983 || (mat & M_IRON && rndm (1, 5) == 1)
984 || (mat & M_GLASS && rndm (1, 2) == 1)
985 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
986 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
987 || (mat & M_ICE && temp > 32))
988 destroy = 1;
989 }
990
991 /* adjust overall chance below */
992 if (destroy && rndm (0, 1))
993 op->destroy ();
994 }
958} 995}
959 996
960/* 997/*
961 * Updates every button on the map (by calling update_button() for them). 998 * Updates every button on the map (by calling update_button() for them).
962 */ 999 */
… …
1010 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1047 if (QUERY_FLAG (op, FLAG_GENERATOR))
1011 { 1048 {
1012 total_exp += op->stats.exp; 1049 total_exp += op->stats.exp;
1013 1050
1014 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1051 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1015 total_exp += at->clone.stats.exp * 8; 1052 total_exp += at->stats.exp * 8;
1016 1053
1017 monster_cnt++; 1054 monster_cnt++;
1018 } 1055 }
1019 } 1056 }
1020 1057

Diff Legend

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