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.110 by root, Sun Jul 1 05:00:17 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 for (object *op = ms->bot; op; op = op->above)
360 { 361 {
361 /* already multipart - don't do anything more */ 362 /* already multipart - don't do anything more */
362 if (!tmp->head && !tmp->more) 363 if (op->head_ () == op && !op->more && op->arch->more)
363 { 364 {
364 /* If there is nothing more to this object, this for loop 365 op->remove ();
365 * won't do anything. 366 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); 367 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
390 }
391 } 368 }
392 } 369 }
393} 370}
394 371
395/* 372/*
… …
399bool 376bool
400maptile::_load_objects (object_thawer &f) 377maptile::_load_objects (object_thawer &f)
401{ 378{
402 for (;;) 379 for (;;)
403 { 380 {
404 coroapi::cede_every (1000); // cede once in a while 381 coroapi::cede_to_tick_every (100); // cede once in a while
405 382
406 switch (f.kw) 383 switch (f.kw)
407 { 384 {
408 case KW_arch: 385 case KW_arch:
409 if (object *op = object::read (f, this)) 386 if (object *op = object::read (f, this))
… …
432} 409}
433 410
434void 411void
435maptile::activate () 412maptile::activate ()
436{ 413{
414 active = true;
415
437 if (!spaces) 416 if (spaces)
438 return;
439
440 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 417 for (mapspace *ms = spaces + size (); ms-- > spaces; )
441 for (object *op = ms->bot; op; op = op->above) 418 for (object *op = ms->bot; op; op = op->above)
442 op->activate_recursive (); 419 op->activate_recursive ();
443} 420}
444 421
445void 422void
446maptile::deactivate () 423maptile::deactivate ()
447{ 424{
425 active = false;
426
448 if (!spaces) 427 if (spaces)
449 return;
450
451 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 428 for (mapspace *ms = spaces + size (); ms-- > spaces; )
452 for (object *op = ms->bot; op; op = op->above) 429 for (object *op = ms->bot; op; op = op->above)
453 op->deactivate_recursive (); 430 op->deactivate_recursive ();
454} 431}
455 432
456bool 433bool
457maptile::_save_objects (object_freezer &f, int flags) 434maptile::_save_objects (object_freezer &f, int flags)
458{ 435{
459 static int cede_count = 0; 436 coroapi::cede_to_tick ();
460 437
461 if (flags & IO_HEADER) 438 if (flags & IO_HEADER)
462 _save_header (f); 439 _save_header (f);
463 440
464 if (!spaces) 441 if (!spaces)
465 return false; 442 return false;
466 443
467 for (int i = 0; i < size (); ++i) 444 for (int i = 0; i < size (); ++i)
468 { 445 {
469 if (cede_count >= 500)
470 {
471 cede_count = 0;
472 coroapi::cede ();
473 }
474
475 int unique = 0; 446 int unique = 0;
476 for (object *op = spaces [i].bot; op; op = op->above) 447 for (object *op = spaces [i].bot; op; op = op->above)
477 { 448 {
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]) 449 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
482 unique = 1; 450 unique = 1;
483 451
484 if (!op->can_map_save ()) 452 if (!op->can_map_save ())
485 continue; 453 continue;
… …
491 } 459 }
492 else if (flags & IO_OBJECTS) 460 else if (flags & IO_OBJECTS)
493 op->write (f); 461 op->write (f);
494 } 462 }
495 } 463 }
464
465 coroapi::cede_to_tick ();
496 466
497 return true; 467 return true;
498} 468}
499 469
500bool 470bool
… …
699bool 669bool
700maptile::_load_header (object_thawer &thawer) 670maptile::_load_header (object_thawer &thawer)
701{ 671{
702 for (;;) 672 for (;;)
703 { 673 {
704 keyword kw = thawer.get_kv (); 674 thawer.next ();
705 675
706 switch (kw) 676 switch (thawer.kw)
707 { 677 {
708 case KW_msg: 678 case KW_msg:
709 thawer.get_ml (KW_endmsg, msg); 679 thawer.get_ml (KW_endmsg, msg);
710 break; 680 break;
711 681
… …
743 case KW_winddir: thawer.get (winddir); break; 713 case KW_winddir: thawer.get (winddir); break;
744 case KW_sky: thawer.get (sky); break; 714 case KW_sky: thawer.get (sky); break;
745 715
746 case KW_per_player: thawer.get (per_player); break; 716 case KW_per_player: thawer.get (per_player); break;
747 case KW_per_party: thawer.get (per_party); break; 717 case KW_per_party: thawer.get (per_party); break;
718 case KW_no_reset: thawer.get (no_reset); break;
748 719
749 case KW_region: default_region = region::find (thawer.get_str ()); break; 720 case KW_region: default_region = region::find (thawer.get_str ()); break;
750 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
751 722
752 // old names new names 723 // old names new names
… …
805 object *above = op->above; 776 object *above = op->above;
806 777
807 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
808 unique = 1; 779 unique = 1;
809 780
810 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
811 { 782 {
812 op->destroy_inv (false); 783 op->destroy_inv (false);
813 op->destroy (); 784 op->destroy ();
814 } 785 }
815 786
… …
829 if (name) MAP_OUT (name); 800 if (name) MAP_OUT (name);
830 MAP_OUT (swap_time); 801 MAP_OUT (swap_time);
831 MAP_OUT (reset_time); 802 MAP_OUT (reset_time);
832 MAP_OUT (reset_timeout); 803 MAP_OUT (reset_timeout);
833 MAP_OUT (fixed_resettime); 804 MAP_OUT (fixed_resettime);
805 MAP_OUT (no_reset);
834 MAP_OUT (difficulty); 806 MAP_OUT (difficulty);
835 807
836 if (default_region) MAP_OUT2 (region, default_region->name); 808 if (default_region) MAP_OUT2 (region, default_region->name);
837 809
838 if (shopitems) 810 if (shopitems)
… …
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)
904 { 876 {
905 if (op->head)
906 op = op->head; 877 op = op->head_ ();
907
908 op->destroy_inv (false); 878 op->destroy_inv (false);
909 op->destroy (); 879 op->destroy ();
910 } 880 }
911 881
912 sfree (spaces, size ()), spaces = 0; 882 sfree (spaces, size ()), spaces = 0;
… …
951maptile::do_destroy () 921maptile::do_destroy ()
952{ 922{
953 attachable::do_destroy (); 923 attachable::do_destroy ();
954 924
955 clear (); 925 clear ();
926}
927
928/* decay and destroy perishable items in a map */
929void
930maptile::do_decay_objects ()
931{
932 if (!spaces)
933 return;
934
935 for (mapspace *ms = spaces + size (); ms-- > spaces; )
936 for (object *above, *op = ms->bot; op; op = above)
937 {
938 above = op->above;
939
940 bool destroy = 0;
941
942 // do not decay anything above unique floor tiles (yet :)
943 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
944 break;
945
946 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
947 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
948 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
949 || QUERY_FLAG (op, FLAG_UNIQUE)
950 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
951 || QUERY_FLAG (op, FLAG_UNPAID)
952 || op->is_alive ())
953 ; // do not decay
954 else if (op->is_weapon ())
955 {
956 op->stats.dam--;
957 if (op->stats.dam < 0)
958 destroy = 1;
959 }
960 else if (op->is_armor ())
961 {
962 op->stats.ac--;
963 if (op->stats.ac < 0)
964 destroy = 1;
965 }
966 else if (op->type == FOOD)
967 {
968 op->stats.food -= rndm (5, 20);
969 if (op->stats.food < 0)
970 destroy = 1;
971 }
972 else
973 {
974 int mat = op->materials;
975
976 if (mat & M_PAPER
977 || mat & M_LEATHER
978 || mat & M_WOOD
979 || mat & M_ORGANIC
980 || mat & M_CLOTH
981 || mat & M_LIQUID
982 || (mat & M_IRON && rndm (1, 5) == 1)
983 || (mat & M_GLASS && rndm (1, 2) == 1)
984 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
985 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
986 || (mat & M_ICE && temp > 32))
987 destroy = 1;
988 }
989
990 /* adjust overall chance below */
991 if (destroy && rndm (0, 1))
992 op->destroy ();
993 }
956} 994}
957 995
958/* 996/*
959 * Updates every button on the map (by calling update_button() for them). 997 * Updates every button on the map (by calling update_button() for them).
960 */ 998 */
… …
1008 if (QUERY_FLAG (op, FLAG_GENERATOR)) 1046 if (QUERY_FLAG (op, FLAG_GENERATOR))
1009 { 1047 {
1010 total_exp += op->stats.exp; 1048 total_exp += op->stats.exp;
1011 1049
1012 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 1050 if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1013 total_exp += at->clone.stats.exp * 8; 1051 total_exp += at->stats.exp * 8;
1014 1052
1015 monster_cnt++; 1053 monster_cnt++;
1016 } 1054 }
1017 } 1055 }
1018 1056

Diff Legend

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