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.114 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.135 by root, Sun Apr 20 23:25:09 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 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"
… …
166 } 166 }
167 return 0; 167 return 0;
168} 168}
169 169
170/* 170/*
171 * Returns true if the given object can't fit in the given spot. 171 * 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, 172 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 173 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the 174 * of object. This function goes through all the parts of the multipart
175 * multipart object and makes sure they can be inserted. 175 * object and makes sure they can be inserted.
176 * 176 *
177 * While this doesn't call out of map, the get_map_flags does. 177 * While this doesn't call out of map, the get_map_flags does.
178 * 178 *
179 * This function has been used to deprecate arch_out_of_map - 179 * This function has been used to deprecate arch_out_of_map -
180 * this function also does that check, and since in most cases, 180 * this function also does that check, and since in most cases,
… …
191 * 191 *
192 * Note this used to be arch_blocked, but with new movement 192 * Note this used to be arch_blocked, but with new movement
193 * code, we need to have actual object to check its move_type 193 * code, we need to have actual object to check its move_type
194 * against the move_block values. 194 * against the move_block values.
195 */ 195 */
196int 196bool
197ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y) 197object::blocked (maptile *m, int x, int y) const
198{ 198{
199 archetype *tmp; 199 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 } 200 {
201 mapxy pos (m, x + tmp->x, y + tmp->y);
213 202
214 for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more) 203 if (!pos.normalise ())
215 { 204 return 1;
216 flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
217 205
218 if (flag & P_OUT_OF_MAP) 206 mapspace &ms = *pos;
219 return P_OUT_OF_MAP; 207
220 if (flag & P_IS_ALIVE) 208 if (ms.flags () & P_IS_ALIVE)
221 return P_IS_ALIVE; 209 return 1;
222 210
223 mapspace &ms = m1->at (sx, sy); 211 /* However, often ob doesn't have any move type
224 212 * (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. 213 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
228 */ 214 */
229
230 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 215 if (!move_type && ms.move_block != MOVE_ALL)
231 continue; 216 continue;
232 217
233 /* Note it is intentional that we check ob - the movement type of the 218 /* Note it is intentional that we check ob - the movement type of the
234 * head of the object should correspond for the entire object. 219 * head of the object should correspond for the entire object.
235 */ 220 */
236 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 221 if (ms.blocks (move_type))
237 return P_NO_PASS; 222 return 1;
238 } 223 }
239 224
240 return 0; 225 return 0;
241} 226}
242 227
… …
260 245
261 insert_ob_in_ob (tmp, container); 246 insert_ob_in_ob (tmp, container);
262 tmp = next; 247 tmp = next;
263 } 248 }
264 249
265 /* sum_weight will go through and calculate what all the containers are 250 // go through and calculate what all the containers are carrying.
266 * carrying. 251 //TODO: remove
267 */ 252 container->update_weight ();
268 sum_weight (container);
269} 253}
270 254
271void 255void
272maptile::set_object_flag (int flag, int value) 256maptile::set_object_flag (int flag, int value)
273{ 257{
… …
322bool 306bool
323maptile::_load_objects (object_thawer &f) 307maptile::_load_objects (object_thawer &f)
324{ 308{
325 for (;;) 309 for (;;)
326 { 310 {
327 coroapi::cede_to_tick_every (100); // cede once in a while 311 coroapi::cede_to_tick (); // cede once in a while
328 312
329 switch (f.kw) 313 switch (f.kw)
330 { 314 {
331 case KW_arch: 315 case KW_arch:
332 if (object *op = object::read (f, this)) 316 if (object *op = object::read (f, this))
333 { 317 {
318 // TODO: why?
334 if (op->inv) 319 if (op->inv)
335 sum_weight (op); 320 op->update_weight ();
336 321
337 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 {
324 // we insert manually because
325 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct
328 mapspace &ms = at (op->x, op->y);
329
330 op->flag [FLAG_REMOVED] = false;
331
332 op->above = 0;
333 op->below = ms.top;
334
335 if (ms.top)
336 ms.top->above = op;
337 else
338 ms.bot = op;
339
340 ms.top = op;
341 ms.flags_ = 0;
342 }
343 else
344 {
345 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
346 op->destroy ();
347 }
338 } 348 }
339 349
340 continue; 350 continue;
341 351
342 case KW_EOF: 352 case KW_EOF:
… …
355} 365}
356 366
357void 367void
358maptile::activate () 368maptile::activate ()
359{ 369{
360 active = true;
361
362 if (spaces) 370 if (spaces)
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 371 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 372 for (object *op = ms->bot; op; op = op->above)
365 op->activate_recursive (); 373 op->activate_recursive ();
366} 374}
367 375
368void 376void
369maptile::deactivate () 377maptile::deactivate ()
370{ 378{
371 active = false;
372
373 if (spaces) 379 if (spaces)
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 380 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 381 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 382 op->deactivate_recursive ();
377} 383}
… …
387 if (!spaces) 393 if (!spaces)
388 return false; 394 return false;
389 395
390 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
391 { 397 {
392 int unique = 0; 398 bool unique = 0;
399
393 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
394 { 401 {
395 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
396 unique = 1;
397 403
398 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
399 continue; 405 continue;
400 406
401 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
402 { 408 {
403 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
404 op->write (f); 410 op->write (f);
405 } 411 }
406 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
407 op->write (f); 413 op->write (f);
408 } 414 }
409 } 415 }
410 416
411 coroapi::cede_to_tick (); 417 coroapi::cede_to_tick ();
412 418
413 return true; 419 return true;
414}
415
416bool
417maptile::_load_objects (const char *path, bool skip_header)
418{
419 object_thawer f (path);
420
421 if (!f)
422 return false;
423
424 f.next ();
425
426 if (skip_header)
427 for (;;)
428 {
429 keyword kw = f.kw;
430 f.skip ();
431 if (kw == KW_end)
432 break;
433 }
434
435 return _load_objects (f);
436} 420}
437 421
438bool 422bool
439maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
440{ 424{
… …
615bool 599bool
616maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
617{ 601{
618 for (;;) 602 for (;;)
619 { 603 {
620 thawer.next ();
621
622 switch (thawer.kw) 604 switch (thawer.kw)
623 { 605 {
624 case KW_msg: 606 case KW_msg:
625 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
626 break; 608 break;
… …
681 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
682 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
683 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
684 666
685 case KW_ERROR: 667 case KW_ERROR:
686 set_key (thawer.kw_str, thawer.value); 668 set_key_text (thawer.kw_str, thawer.value);
687 break; 669 break;
688 670
689 case KW_end: 671 case KW_end:
672 thawer.next ();
690 return true; 673 return true;
691 674
692 default: 675 default:
693 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
694 return false; 677 return false;
695 break; 678 break;
696 } 679 }
680
681 thawer.next ();
697 } 682 }
698 683
699 abort (); 684 abort ();
700}
701
702bool
703maptile::_load_header (const char *path)
704{
705 object_thawer thawer (path);
706
707 if (!thawer)
708 return false;
709
710 return _load_header (thawer);
711} 685}
712 686
713/****************************************************************************** 687/******************************************************************************
714 * This is the start of unique map handling code 688 * This is the start of unique map handling code
715 *****************************************************************************/ 689 *****************************************************************************/
… …
814 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
815 */ 789 */
816void 790void
817maptile::clear () 791maptile::clear ()
818{ 792{
819 sfree (regions, size ()); regions = 0;
820 delete [] regionmap; regionmap = 0;
821
822 if (spaces) 793 if (spaces)
823 { 794 {
824 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
825 while (object *op = ms->bot) 796 while (object *op = ms->bot)
826 { 797 {
798 // manually remove, as to not trigger anything
799 if (ms->bot = op->above)
800 ms->bot->below = 0;
801
802 op->flag [FLAG_REMOVED] = true;
803
827 op = op->head_ (); 804 object *head = op->head_ ();
805 if (op == head)
806 {
828 op->destroy_inv (false); 807 op->destroy_inv (false);
829 op->destroy (); 808 op->destroy ();
809 }
810 else if (head->map != op->map)
811 {
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy ();
814 }
830 } 815 }
831 816
832 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
833 } 818 }
834 819
835 if (buttons) 820 if (buttons)
836 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
837} 825}
838 826
839void 827void
840maptile::clear_header () 828maptile::clear_header ()
841{ 829{
… …
893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 881 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
894 break; 882 break;
895 883
896 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
898 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
899 || QUERY_FLAG (op, FLAG_UNIQUE) 886 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID) 888 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 889 || op->is_alive ())
903 ; // do not decay 890 ; // do not decay
… …
1228 vol += op->volume (); 1215 vol += op->volume ();
1229 1216
1230 return vol; 1217 return vol;
1231} 1218}
1232 1219
1233/* this updates the orig_map->tile_map[tile_num] value after finding 1220bool
1234 * the map. It also takes care of linking back the freshly found 1221maptile::tile_available (int dir, bool load)
1235 * maps tile_map values if it tiles back to this one. It returns
1236 * the value of orig_map->tile_map[tile_num].
1237 */
1238static inline maptile *
1239find_and_link (maptile *orig_map, int tile_num)
1240{ 1222{
1241 maptile *mp = orig_map->tile_map [tile_num]; 1223 if (!tile_path[dir])
1224 return 0;
1242 1225
1243 if (!mp) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1244 { 1227 return 1;
1245 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1246 1228
1247 if (!mp) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1248 { 1230 return 1;
1249 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1250 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1251 &orig_map->tile_path[tile_num], &orig_map->path);
1252 mp = new maptile (1, 1);
1253 mp->alloc ();
1254 mp->in_memory = MAP_IN_MEMORY;
1255 }
1256 }
1257 1231
1258 int dest_tile = (tile_num + 2) % 4;
1259
1260 orig_map->tile_map [tile_num] = mp;
1261
1262 // optimisation: back-link map to origin map if euclidean
1263 //TODO: non-euclidean maps MUST GO
1264 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1265 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1266
1267 return mp; 1232 return 0;
1268}
1269
1270static inline void
1271load_and_link (maptile *orig_map, int tile_num)
1272{
1273 find_and_link (orig_map, tile_num)->load_sync ();
1274} 1233}
1275 1234
1276/* this returns TRUE if the coordinates (x,y) are out of 1235/* this returns TRUE if the coordinates (x,y) are out of
1277 * map m. This function also takes into account any 1236 * map m. This function also takes into account any
1278 * tiling considerations, loading adjacant maps as needed. 1237 * tiling considerations, loading adjacant maps as needed.
… …
1291 if (!m) 1250 if (!m)
1292 return 0; 1251 return 0;
1293 1252
1294 if (x < 0) 1253 if (x < 0)
1295 { 1254 {
1296 if (!m->tile_path[3]) 1255 if (!m->tile_available (3))
1297 return 1; 1256 return 1;
1298 1257
1299 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1300 find_and_link (m, 3);
1301
1302 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1258 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1303 } 1259 }
1304 1260
1305 if (x >= m->width) 1261 if (x >= m->width)
1306 { 1262 {
1307 if (!m->tile_path[1]) 1263 if (!m->tile_available (1))
1308 return 1; 1264 return 1;
1309 1265
1310 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1311 find_and_link (m, 1);
1312
1313 return out_of_map (m->tile_map[1], x - m->width, y); 1266 return out_of_map (m->tile_map[1], x - m->width, y);
1314 } 1267 }
1315 1268
1316 if (y < 0) 1269 if (y < 0)
1317 { 1270 {
1318 if (!m->tile_path[0]) 1271 if (!m->tile_available (0))
1319 return 1; 1272 return 1;
1320 1273
1321 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1322 find_and_link (m, 0);
1323
1324 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1274 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1325 } 1275 }
1326 1276
1327 if (y >= m->height) 1277 if (y >= m->height)
1328 { 1278 {
1329 if (!m->tile_path[2]) 1279 if (!m->tile_available (2))
1330 return 1; 1280 return 1;
1331
1332 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1333 find_and_link (m, 2);
1334 1281
1335 return out_of_map (m->tile_map[2], x, y - m->height); 1282 return out_of_map (m->tile_map[2], x, y - m->height);
1336 } 1283 }
1337 1284
1338 /* Simple case - coordinates are within this local 1285 /* Simple case - coordinates are within this local
… …
1352maptile * 1299maptile *
1353maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1354{ 1301{
1355 if (x < 0) 1302 if (x < 0)
1356 { 1303 {
1357 if (!tile_path[3]) 1304 if (!tile_available (3))
1358 return 0; 1305 return 0;
1359 1306
1360 find_and_link (this, 3);
1361 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1362 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1363 } 1309 }
1364 1310
1365 if (x >= width) 1311 if (x >= width)
1366 { 1312 {
1367 if (!tile_path[1]) 1313 if (!tile_available (1))
1368 return 0; 1314 return 0;
1369 1315
1370 find_and_link (this, 1);
1371 x -= width; 1316 x -= width;
1372 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1373 } 1318 }
1374 1319
1375 if (y < 0) 1320 if (y < 0)
1376 { 1321 {
1377 if (!tile_path[0]) 1322 if (!tile_available (0))
1378 return 0; 1323 return 0;
1379 1324
1380 find_and_link (this, 0);
1381 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1382 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1383 } 1327 }
1384 1328
1385 if (y >= height) 1329 if (y >= height)
1386 { 1330 {
1387 if (!tile_path[2]) 1331 if (!tile_available (2))
1388 return 0; 1332 return 0;
1389 1333
1390 find_and_link (this, 2);
1391 y -= height; 1334 y -= height;
1392 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1393 } 1336 }
1394 1337
1395 /* Simple case - coordinates are within this local 1338 /* Simple case - coordinates are within this local
… …
1406adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1407{ 1350{
1408 if (!map1 || !map2) 1351 if (!map1 || !map2)
1409 return 0; 1352 return 0;
1410 1353
1411 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1354 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1412 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1413 if (map1 == map2) 1356 if (map1 == map2)
1414 { 1357 {
1415 *dx = 0; 1358 *dx = 0;
1416 *dy = 0; 1359 *dy = 0;
… …
1670 1613
1671 // instead of crashing in the unlikely(?) case, try to return *something* 1614 // instead of crashing in the unlikely(?) case, try to return *something*
1672 return get_archetype ("blocked"); 1615 return get_archetype ("blocked");
1673} 1616}
1674 1617
1675/**
1676 * Maximum distance a player may hear a sound from.
1677 * This is only used for new client/server sound. If the sound source
1678 * on the map is farther away than this, we don't sent it to the client.
1679 */
1680#define MAX_SOUND_DISTANCE 10
1681
1682void 1618void
1683maptile::play_sound (faceidx sound, int x, int y) const 1619maptile::play_sound (faceidx sound, int x, int y) const
1684{ 1620{
1685 if (!sound) 1621 if (!sound)
1686 return; 1622 return;

Diff Legend

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