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.127 by root, Fri Sep 7 18:03:31 2007 UTC vs.
Revision 1.143 by root, Sun May 18 19:53:07 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)
… …
789 if (ms->bot = op->above) 800 if (ms->bot = op->above)
790 ms->bot->below = 0; 801 ms->bot->below = 0;
791 802
792 op->flag [FLAG_REMOVED] = true; 803 op->flag [FLAG_REMOVED] = true;
793 804
805 object *head = op->head_ ();
794 if (op == op->head_ ()) 806 if (op == head)
795 { 807 {
796 op->destroy_inv (false); 808 op->destroy_inv (false);
797 op->destroy (); 809 op->destroy ();
798 } 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 }
799 } 816 }
800 817
801 sfree (spaces, size ()), spaces = 0; 818 sfree0 (spaces, size ());
802 } 819 }
803 820
804 if (buttons) 821 if (buttons)
805 free_objectlinkpt (buttons), buttons = 0; 822 free_objectlinkpt (buttons), buttons = 0;
806 823
807 sfree (regions, size ()); regions = 0; 824 sfree0 (regions, size ());
808 delete [] regionmap; regionmap = 0; 825 delete [] regionmap; regionmap = 0;
809} 826}
810 827
811void 828void
812maptile::clear_header () 829maptile::clear_header ()
… …
966 983
967 if (QUERY_FLAG (op, FLAG_GENERATOR)) 984 if (QUERY_FLAG (op, FLAG_GENERATOR))
968 { 985 {
969 total_exp += op->stats.exp; 986 total_exp += op->stats.exp;
970 987
971 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 988 if (archetype *at = op->other_arch)
989 {
972 total_exp += at->stats.exp * 8; 990 total_exp += at->stats.exp * 8;
973
974 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 }
975 } 999 }
976 } 1000 }
977 1001
978 avgexp = (double) total_exp / monster_cnt; 1002 avgexp = (double) total_exp / monster_cnt;
979 1003
… …
1018 else 1042 else
1019 darkness = new_level; 1043 darkness = new_level;
1020 1044
1021 /* All clients need to get re-updated for the change */ 1045 /* All clients need to get re-updated for the change */
1022 update_all_map_los (this); 1046 update_all_map_los (this);
1047
1023 return 1; 1048 return 1;
1024} 1049}
1025 1050
1026/* 1051/*
1027 * This function updates various attributes about a specific space 1052 * This function updates various attributes about a specific space
… …
1030 * through, etc) 1055 * through, etc)
1031 */ 1056 */
1032void 1057void
1033mapspace::update_ () 1058mapspace::update_ ()
1034{ 1059{
1035 object *tmp, *last = 0; 1060 object *last = 0;
1036 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1037 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1038 1063
1039 //object *middle = 0; 1064 //object *middle = 0;
1040 //object *top = 0; 1065 //object *top = 0;
… …
1042 // this seems to generate better code than using locals, above 1067 // this seems to generate better code than using locals, above
1043 object *&top = faces_obj[0] = 0; 1068 object *&top = faces_obj[0] = 0;
1044 object *&middle = faces_obj[1] = 0; 1069 object *&middle = faces_obj[1] = 0;
1045 object *&floor = faces_obj[2] = 0; 1070 object *&floor = faces_obj[2] = 0;
1046 1071
1047 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1072 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1048 { 1073 {
1049 /* This could be made additive I guess (two lights better than 1074 /* This could be made additive I guess (two lights better than
1050 * one). But if so, it shouldn't be a simple additive - 2 1075 * one). But if so, it shouldn't be a simple additive - 2
1051 * light bulbs do not illuminate twice as far as once since 1076 * light bulbs do not illuminate twice as far as once since
1052 * it is a dissapation factor that is cubed. 1077 * it is a dissapation factor that is cubed.
1053 */ 1078 */
1054 if (tmp->glow_radius > light)
1055 light = tmp->glow_radius; 1079 light = max (light, tmp->glow_radius);
1056 1080
1057 /* This call is needed in order to update objects the player 1081 /* This call is needed in order to update objects the player
1058 * is standing in that have animations (ie, grass, fire, etc). 1082 * is standing in that have animations (ie, grass, fire, etc).
1059 * However, it also causes the look window to be re-drawn 1083 * However, it also causes the look window to be re-drawn
1060 * 3 times each time the player moves, because many of the 1084 * 3 times each time the player moves, because many of the
… …
1079 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1103 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1080 { 1104 {
1081 middle = tmp; 1105 middle = tmp;
1082 anywhere = 1; 1106 anywhere = 1;
1083 } 1107 }
1108
1084 /* Find the highest visible face around. If equal 1109 /* Find the highest visible face around. If equal
1085 * visibilities, we still want the one nearer to the 1110 * visibilities, we still want the one nearer to the
1086 * top 1111 * top
1087 */ 1112 */
1088 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere)) 1113 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
… …
1137 * 1) top face is set, need middle to be set. 1162 * 1) top face is set, need middle to be set.
1138 * 2) middle is set, need to set top. 1163 * 2) middle is set, need to set top.
1139 * 3) neither middle or top is set - need to set both. 1164 * 3) neither middle or top is set - need to set both.
1140 */ 1165 */
1141 1166
1142 for (tmp = last; tmp; tmp = tmp->below) 1167 for (object *tmp = last; tmp; tmp = tmp->below)
1143 { 1168 {
1144 /* Once we get to a floor, stop, since we already have a floor object */ 1169 /* Once we get to a floor, stop, since we already have a floor object */
1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1170 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1146 break; 1171 break;
1147 1172
… …
1205maptile::tile_available (int dir, bool load) 1230maptile::tile_available (int dir, bool load)
1206{ 1231{
1207 if (!tile_path[dir]) 1232 if (!tile_path[dir])
1208 return 0; 1233 return 0;
1209 1234
1210 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1235 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1211 return 1; 1236 return 1;
1212 1237
1213 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1214 return 1; 1239 return 1;
1215 1240
… …
1550} 1575}
1551 1576
1552object * 1577object *
1553maptile::insert (object *op, int x, int y, object *originator, int flags) 1578maptile::insert (object *op, int x, int y, object *originator, int flags)
1554{ 1579{
1555 if (!op->flag [FLAG_REMOVED])
1556 op->remove ();
1557
1558 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1580 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1559} 1581}
1560 1582
1561region * 1583region *
1562maptile::region (int x, int y) const 1584maptile::region (int x, int y) const
… …
1572 1594
1573 return ::region::default_region (); 1595 return ::region::default_region ();
1574} 1596}
1575 1597
1576/* picks a random object from a style map. 1598/* picks a random object from a style map.
1577 * Redone by MSW so it should be faster and not use static
1578 * variables to generate tables.
1579 */ 1599 */
1580object * 1600object *
1581maptile::pick_random_object () const 1601maptile::pick_random_object (rand_gen &gen) const
1582{ 1602{
1583 /* while returning a null object will result in a crash, that 1603 /* while returning a null object will result in a crash, that
1584 * is actually preferable to an infinite loop. That is because 1604 * is actually preferable to an infinite loop. That is because
1585 * most servers will automatically restart in case of crash. 1605 * most servers will automatically restart in case of crash.
1586 * Change the logic on getting the random space - shouldn't make 1606 * Change the logic on getting the random space - shouldn't make
1587 * any difference, but this seems clearer to me. 1607 * any difference, but this seems clearer to me.
1588 */ 1608 */
1589 for (int i = 1000; --i;) 1609 for (int i = 1000; --i;)
1590 { 1610 {
1591 object *pick = at (rndm (width), rndm (height)).bot; 1611 object *pick = at (gen (width), gen (height)).bot;
1592 1612
1593 // do not prefer big monsters just because they are big. 1613 // do not prefer big monsters just because they are big.
1594 if (pick && pick->head_ () == pick) 1614 if (pick && pick->is_head ())
1595 return pick->head_ (); 1615 return pick->head_ ();
1596 } 1616 }
1597 1617
1598 // instead of crashing in the unlikely(?) case, try to return *something* 1618 // instead of crashing in the unlikely(?) case, try to return *something*
1599 return get_archetype ("blocked"); 1619 return archetype::find ("bug");
1600} 1620}
1601 1621
1602void 1622void
1603maptile::play_sound (faceidx sound, int x, int y) const 1623maptile::play_sound (faceidx sound, int x, int y) const
1604{ 1624{
1605 if (!sound) 1625 if (!sound)
1606 return; 1626 return;
1607 1627
1608 for_all_players (pl) 1628 for_all_players (pl)
1609 if (pl->observe->map == this) 1629 if (pl->ob->map == this)
1610 if (client *ns = pl->ns) 1630 if (client *ns = pl->ns)
1611 { 1631 {
1612 int dx = x - pl->observe->x; 1632 int dx = x - pl->ob->x;
1613 int dy = y - pl->observe->y; 1633 int dy = y - pl->ob->y;
1614 1634
1615 int distance = idistance (dx, dy); 1635 int distance = idistance (dx, dy);
1616 1636
1617 if (distance <= MAX_SOUND_DISTANCE) 1637 if (distance <= MAX_SOUND_DISTANCE)
1618 ns->play_sound (sound, dx, dy); 1638 ns->play_sound (sound, dx, dy);

Diff Legend

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