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.124 by root, Tue Sep 4 05:43:20 2007 UTC vs.
Revision 1.141 by root, Wed May 7 11:02:50 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <unistd.h> 24#include <unistd.h>
25 25
26#include "global.h" 26#include "global.h"
27#include "funcpoint.h"
28 27
29#include "loader.h" 28#include "loader.h"
30 29
31#include "path.h" 30#include "path.h"
32 31
… …
166 } 165 }
167 return 0; 166 return 0;
168} 167}
169 168
170/* 169/*
171 * Returns true if the given object can't fit in the given spot. 170 * Returns qthe blocking object if the given object can't fit in the given
172 * This is meant for multi space objects - for single space objecs, 171 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 172 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 173 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 174 * object and makes sure they can be inserted.
176 * 175 *
177 * While this doesn't call out of map, the get_map_flags does. 176 * While this doesn't call out of map, the get_map_flags does.
178 * 177 *
179 * This function has been used to deprecate arch_out_of_map - 178 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 179 * this function also does that check, and since in most cases,
… …
191 * 190 *
192 * Note this used to be arch_blocked, but with new movement 191 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 192 * code, we need to have actual object to check its move_type
194 * against the move_block values. 193 * against the move_block values.
195 */ 194 */
196int 195bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 196object::blocked (maptile *m, int x, int y) const
198{ 197{
199 archetype *tmp; 198 for (archetype *tmp = arch; tmp; tmp = (archetype *)tmp->more)
200 int flag;
201 maptile *m1;
202 sint16 sx, sy;
203
204 if (!ob)
205 {
206 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
207 if (flag & P_OUT_OF_MAP)
208 return P_OUT_OF_MAP;
209
210 /* don't have object, so don't know what types would block */
211 return m1->at (sx, sy).move_block;
212 } 199 {
200 mapxy pos (m, x + tmp->x, y + tmp->y);
213 201
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 202 if (!pos.normalise ())
215 { 203 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 204
218 if (flag & P_OUT_OF_MAP) 205 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 206
220 if (flag & P_IS_ALIVE) 207 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 208 return 1;
222 209
223 mapspace &ms = m1->at (sx, sy); 210 /* However, often ob doesn't have any move type
224 211 * (signifying non-moving objects)
225 /* find_first_free_spot() calls this function. However, often
226 * ob doesn't have any move type (when used to place exits)
227 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 212 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 213 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 214 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 215 continue;
232 216
233 /* Note it is intentional that we check ob - the movement type of the 217 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 218 * head of the object should correspond for the entire object.
235 */ 219 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 220 if (ms.blocks (move_type))
237 return P_NO_PASS; 221 return 1;
238 } 222 }
239 223
240 return 0; 224 return 0;
241} 225}
242 226
… …
260 244
261 insert_ob_in_ob (tmp, container); 245 insert_ob_in_ob (tmp, container);
262 tmp = next; 246 tmp = next;
263 } 247 }
264 248
265 /* sum_weight will go through and calculate what all the containers are 249 // go through and calculate what all the containers are carrying.
266 * carrying. 250 //TODO: remove
267 */ 251 container->update_weight ();
268 sum_weight (container);
269} 252}
270 253
271void 254void
272maptile::set_object_flag (int flag, int value) 255maptile::set_object_flag (int flag, int value)
273{ 256{
… …
322bool 305bool
323maptile::_load_objects (object_thawer &f) 306maptile::_load_objects (object_thawer &f)
324{ 307{
325 for (;;) 308 for (;;)
326 { 309 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 310 coroapi::cede_to_tick (); // cede once in a while
328 311
329 switch (f.kw) 312 switch (f.kw)
330 { 313 {
331 case KW_arch: 314 case KW_arch:
332 if (object *op = object::read (f, this)) 315 if (object *op = object::read (f, this))
333 { 316 {
317 // TODO: why?
334 if (op->inv) 318 if (op->inv)
335 sum_weight (op); 319 op->update_weight ();
336 320
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 {
323 // we insert manually because
324 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct
327 mapspace &ms = at (op->x, op->y);
328
329 op->flag [FLAG_REMOVED] = false;
330
331 op->above = 0;
332 op->below = ms.top;
333
334 if (ms.top)
335 ms.top->above = op;
336 else
337 ms.bot = op;
338
339 ms.top = op;
340 ms.flags_ = 0;
341 }
342 else
343 {
344 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
345 op->destroy ();
346 }
338 } 347 }
339 348
340 continue; 349 continue;
341 350
342 case KW_EOF: 351 case KW_EOF:
… …
632 case KW_sky: thawer.get (sky); break; 641 case KW_sky: thawer.get (sky); break;
633 642
634 case KW_per_player: thawer.get (per_player); break; 643 case KW_per_player: thawer.get (per_player); break;
635 case KW_per_party: thawer.get (per_party); break; 644 case KW_per_party: thawer.get (per_party); break;
636 case KW_no_reset: thawer.get (no_reset); break; 645 case KW_no_reset: thawer.get (no_reset); break;
646 case KW_no_drop: thawer.get (no_drop); break;
637 647
638 case KW_region: default_region = region::find (thawer.get_str ()); break; 648 case KW_region: default_region = region::find (thawer.get_str ()); break;
639 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
640 650
641 // old names new names 651 // old names new names
… …
715 MAP_OUT (swap_time); 725 MAP_OUT (swap_time);
716 MAP_OUT (reset_time); 726 MAP_OUT (reset_time);
717 MAP_OUT (reset_timeout); 727 MAP_OUT (reset_timeout);
718 MAP_OUT (fixed_resettime); 728 MAP_OUT (fixed_resettime);
719 MAP_OUT (no_reset); 729 MAP_OUT (no_reset);
730 MAP_OUT (no_drop);
720 MAP_OUT (difficulty); 731 MAP_OUT (difficulty);
721 732
722 if (default_region) MAP_OUT2 (region, default_region->name); 733 if (default_region) MAP_OUT2 (region, default_region->name);
723 734
724 if (shopitems) 735 if (shopitems)
… …
778 * Remove and free all objects in the given map. 789 * Remove and free all objects in the given map.
779 */ 790 */
780void 791void
781maptile::clear () 792maptile::clear ()
782{ 793{
783 sfree (regions, size ()); regions = 0;
784 delete [] regionmap; regionmap = 0;
785
786 if (spaces) 794 if (spaces)
787 { 795 {
788 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 796 for (mapspace *ms = spaces + size (); ms-- > spaces; )
789 while (object *op = ms->bot) 797 while (object *op = ms->bot)
790 { 798 {
799 // manually remove, as to not trigger anything
800 if (ms->bot = op->above)
801 ms->bot->below = 0;
802
803 op->flag [FLAG_REMOVED] = true;
804
791 op = op->head_ (); 805 object *head = op->head_ ();
806 if (op == head)
807 {
792 op->destroy_inv (false); 808 op->destroy_inv (false);
793 op->destroy (); 809 op->destroy ();
810 }
811 else if (head->map != op->map)
812 {
813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
814 head->destroy ();
815 }
794 } 816 }
795 817
796 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
797 } 819 }
798 820
799 if (buttons) 821 if (buttons)
800 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
823
824 sfree0 (regions, size ());
825 delete [] regionmap; regionmap = 0;
801} 826}
802 827
803void 828void
804maptile::clear_header () 829maptile::clear_header ()
805{ 830{
… …
958 983
959 if (QUERY_FLAG (op, FLAG_GENERATOR)) 984 if (QUERY_FLAG (op, FLAG_GENERATOR))
960 { 985 {
961 total_exp += op->stats.exp; 986 total_exp += op->stats.exp;
962 987
963 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 988 if (archetype *at = op->other_arch)
989 {
964 total_exp += at->stats.exp * 8; 990 total_exp += at->stats.exp * 8;
965
966 monster_cnt++; 991 monster_cnt++;
992 }
993
994 for (object *inv = op->inv; inv; inv = inv->below)
995 {
996 total_exp += op->stats.exp * 8;
997 monster_cnt++;
998 }
967 } 999 }
968 } 1000 }
969 1001
970 avgexp = (double) total_exp / monster_cnt; 1002 avgexp = (double) total_exp / monster_cnt;
971 1003
… …
1041 /* This could be made additive I guess (two lights better than 1073 /* This could be made additive I guess (two lights better than
1042 * one). But if so, it shouldn't be a simple additive - 2 1074 * one). But if so, it shouldn't be a simple additive - 2
1043 * light bulbs do not illuminate twice as far as once since 1075 * light bulbs do not illuminate twice as far as once since
1044 * it is a dissapation factor that is cubed. 1076 * it is a dissapation factor that is cubed.
1045 */ 1077 */
1046 if (tmp->glow_radius > light)
1047 light = tmp->glow_radius; 1078 light = max (light, tmp->glow_radius);
1048 1079
1049 /* This call is needed in order to update objects the player 1080 /* This call is needed in order to update objects the player
1050 * is standing in that have animations (ie, grass, fire, etc). 1081 * is standing in that have animations (ie, grass, fire, etc).
1051 * However, it also causes the look window to be re-drawn 1082 * However, it also causes the look window to be re-drawn
1052 * 3 times each time the player moves, because many of the 1083 * 3 times each time the player moves, because many of the
… …
1197maptile::tile_available (int dir, bool load) 1228maptile::tile_available (int dir, bool load)
1198{ 1229{
1199 if (!tile_path[dir]) 1230 if (!tile_path[dir])
1200 return 0; 1231 return 0;
1201 1232
1202 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1233 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1203 return 1; 1234 return 1;
1204 1235
1205 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1236 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1206 return 1; 1237 return 1;
1207 1238
… …
1564 1595
1565 return ::region::default_region (); 1596 return ::region::default_region ();
1566} 1597}
1567 1598
1568/* picks a random object from a style map. 1599/* picks a random object from a style map.
1569 * Redone by MSW so it should be faster and not use static
1570 * variables to generate tables.
1571 */ 1600 */
1572object * 1601object *
1573maptile::pick_random_object () const 1602maptile::pick_random_object (rand_gen &gen) const
1574{ 1603{
1575 /* while returning a null object will result in a crash, that 1604 /* while returning a null object will result in a crash, that
1576 * is actually preferable to an infinite loop. That is because 1605 * is actually preferable to an infinite loop. That is because
1577 * most servers will automatically restart in case of crash. 1606 * most servers will automatically restart in case of crash.
1578 * Change the logic on getting the random space - shouldn't make 1607 * Change the logic on getting the random space - shouldn't make
1579 * any difference, but this seems clearer to me. 1608 * any difference, but this seems clearer to me.
1580 */ 1609 */
1581 for (int i = 1000; --i;) 1610 for (int i = 1000; --i;)
1582 { 1611 {
1583 object *pick = at (rndm (width), rndm (height)).bot; 1612 object *pick = at (gen (width), gen (height)).bot;
1584 1613
1585 // do not prefer big monsters just because they are big. 1614 // do not prefer big monsters just because they are big.
1586 if (pick && pick->head_ () == pick) 1615 if (pick && pick->is_head ())
1587 return pick->head_ (); 1616 return pick->head_ ();
1588 } 1617 }
1589 1618
1590 // instead of crashing in the unlikely(?) case, try to return *something* 1619 // instead of crashing in the unlikely(?) case, try to return *something*
1591 return get_archetype ("blocked"); 1620 return archetype::find ("bug");
1592} 1621}
1593 1622
1594void 1623void
1595maptile::play_sound (faceidx sound, int x, int y) const 1624maptile::play_sound (faceidx sound, int x, int y) const
1596{ 1625{

Diff Legend

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