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.129 by root, Wed Sep 12 11:10:09 2007 UTC

… …
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
… …
355} 340}
356 341
357void 342void
358maptile::activate () 343maptile::activate ()
359{ 344{
360 active = true;
361
362 if (spaces) 345 if (spaces)
363 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 346 for (mapspace *ms = spaces + size (); ms-- > spaces; )
364 for (object *op = ms->bot; op; op = op->above) 347 for (object *op = ms->bot; op; op = op->above)
365 op->activate_recursive (); 348 op->activate_recursive ();
366} 349}
367 350
368void 351void
369maptile::deactivate () 352maptile::deactivate ()
370{ 353{
371 active = false;
372
373 if (spaces) 354 if (spaces)
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 355 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 356 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 357 op->deactivate_recursive ();
377} 358}
… …
387 if (!spaces) 368 if (!spaces)
388 return false; 369 return false;
389 370
390 for (int i = 0; i < size (); ++i) 371 for (int i = 0; i < size (); ++i)
391 { 372 {
392 int unique = 0; 373 bool unique = 0;
374
393 for (object *op = spaces [i].bot; op; op = op->above) 375 for (object *op = spaces [i].bot; op; op = op->above)
394 { 376 {
395 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 377 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
396 unique = 1;
397 378
398 if (!op->can_map_save ()) 379 if (expect_false (!op->can_map_save ()))
399 continue; 380 continue;
400 381
401 if (unique || op->flag [FLAG_UNIQUE]) 382 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
402 { 383 {
403 if (flags & IO_UNIQUES) 384 if (flags & IO_UNIQUES)
404 op->write (f); 385 op->write (f);
405 } 386 }
406 else if (flags & IO_OBJECTS) 387 else if (expect_true (flags & IO_OBJECTS))
407 op->write (f); 388 op->write (f);
408 } 389 }
409 } 390 }
410 391
411 coroapi::cede_to_tick (); 392 coroapi::cede_to_tick ();
412 393
413 return true; 394 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} 395}
437 396
438bool 397bool
439maptile::_save_objects (const char *path, int flags) 398maptile::_save_objects (const char *path, int flags)
440{ 399{
… …
615bool 574bool
616maptile::_load_header (object_thawer &thawer) 575maptile::_load_header (object_thawer &thawer)
617{ 576{
618 for (;;) 577 for (;;)
619 { 578 {
620 thawer.next ();
621
622 switch (thawer.kw) 579 switch (thawer.kw)
623 { 580 {
624 case KW_msg: 581 case KW_msg:
625 thawer.get_ml (KW_endmsg, msg); 582 thawer.get_ml (KW_endmsg, msg);
626 break; 583 break;
… …
681 case KW_tile_path_2: thawer.get (tile_path [1]); break; 638 case KW_tile_path_2: thawer.get (tile_path [1]); break;
682 case KW_tile_path_3: thawer.get (tile_path [2]); break; 639 case KW_tile_path_3: thawer.get (tile_path [2]); break;
683 case KW_tile_path_4: thawer.get (tile_path [3]); break; 640 case KW_tile_path_4: thawer.get (tile_path [3]); break;
684 641
685 case KW_ERROR: 642 case KW_ERROR:
686 set_key (thawer.kw_str, thawer.value); 643 set_key_text (thawer.kw_str, thawer.value);
687 break; 644 break;
688 645
689 case KW_end: 646 case KW_end:
647 thawer.next ();
690 return true; 648 return true;
691 649
692 default: 650 default:
693 if (!thawer.parse_error ("map", 0)) 651 if (!thawer.parse_error ("map", 0))
694 return false; 652 return false;
695 break; 653 break;
696 } 654 }
655
656 thawer.next ();
697 } 657 }
698 658
699 abort (); 659 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} 660}
712 661
713/****************************************************************************** 662/******************************************************************************
714 * This is the start of unique map handling code 663 * This is the start of unique map handling code
715 *****************************************************************************/ 664 *****************************************************************************/
… …
814 * Remove and free all objects in the given map. 763 * Remove and free all objects in the given map.
815 */ 764 */
816void 765void
817maptile::clear () 766maptile::clear ()
818{ 767{
819 sfree (regions, size ()); regions = 0;
820 delete [] regionmap; regionmap = 0;
821
822 if (spaces) 768 if (spaces)
823 { 769 {
824 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 770 for (mapspace *ms = spaces + size (); ms-- > spaces; )
825 while (object *op = ms->bot) 771 while (object *op = ms->bot)
826 { 772 {
773 // manually remove, as to not trigger anything
774 if (ms->bot = op->above)
775 ms->bot->below = 0;
776
777 op->flag [FLAG_REMOVED] = true;
778
827 op = op->head_ (); 779 object *head = op->head_ ();
780 if (op == head)
781 {
828 op->destroy_inv (false); 782 op->destroy_inv (false);
829 op->destroy (); 783 op->destroy ();
784 }
785 else if (head->map != op->map)
786 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy ();
789 }
830 } 790 }
831 791
832 sfree (spaces, size ()), spaces = 0; 792 sfree (spaces, size ()), spaces = 0;
833 } 793 }
834 794
835 if (buttons) 795 if (buttons)
836 free_objectlinkpt (buttons), buttons = 0; 796 free_objectlinkpt (buttons), buttons = 0;
797
798 sfree (regions, size ()); regions = 0;
799 delete [] regionmap; regionmap = 0;
837} 800}
838 801
839void 802void
840maptile::clear_header () 803maptile::clear_header ()
841{ 804{
… …
893 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 856 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
894 break; 857 break;
895 858
896 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 859 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
897 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 860 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
898 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
899 || QUERY_FLAG (op, FLAG_UNIQUE) 861 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 862 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID) 863 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 864 || op->is_alive ())
903 ; // do not decay 865 ; // do not decay
… …
1228 vol += op->volume (); 1190 vol += op->volume ();
1229 1191
1230 return vol; 1192 return vol;
1231} 1193}
1232 1194
1233/* this updates the orig_map->tile_map[tile_num] value after finding 1195bool
1234 * the map. It also takes care of linking back the freshly found 1196maptile::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{ 1197{
1241 maptile *mp = orig_map->tile_map [tile_num]; 1198 if (!tile_path[dir])
1199 return 0;
1242 1200
1243 if (!mp) 1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1244 { 1202 return 1;
1245 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1246 1203
1247 if (!mp) 1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1248 { 1205 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 1206
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; 1207 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} 1208}
1275 1209
1276/* this returns TRUE if the coordinates (x,y) are out of 1210/* this returns TRUE if the coordinates (x,y) are out of
1277 * map m. This function also takes into account any 1211 * map m. This function also takes into account any
1278 * tiling considerations, loading adjacant maps as needed. 1212 * tiling considerations, loading adjacant maps as needed.
… …
1291 if (!m) 1225 if (!m)
1292 return 0; 1226 return 0;
1293 1227
1294 if (x < 0) 1228 if (x < 0)
1295 { 1229 {
1296 if (!m->tile_path[3]) 1230 if (!m->tile_available (3))
1297 return 1; 1231 return 1;
1298 1232
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); 1233 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1303 } 1234 }
1304 1235
1305 if (x >= m->width) 1236 if (x >= m->width)
1306 { 1237 {
1307 if (!m->tile_path[1]) 1238 if (!m->tile_available (1))
1308 return 1; 1239 return 1;
1309 1240
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); 1241 return out_of_map (m->tile_map[1], x - m->width, y);
1314 } 1242 }
1315 1243
1316 if (y < 0) 1244 if (y < 0)
1317 { 1245 {
1318 if (!m->tile_path[0]) 1246 if (!m->tile_available (0))
1319 return 1; 1247 return 1;
1320 1248
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); 1249 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1325 } 1250 }
1326 1251
1327 if (y >= m->height) 1252 if (y >= m->height)
1328 { 1253 {
1329 if (!m->tile_path[2]) 1254 if (!m->tile_available (2))
1330 return 1; 1255 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 1256
1335 return out_of_map (m->tile_map[2], x, y - m->height); 1257 return out_of_map (m->tile_map[2], x, y - m->height);
1336 } 1258 }
1337 1259
1338 /* Simple case - coordinates are within this local 1260 /* Simple case - coordinates are within this local
… …
1352maptile * 1274maptile *
1353maptile::xy_find (sint16 &x, sint16 &y) 1275maptile::xy_find (sint16 &x, sint16 &y)
1354{ 1276{
1355 if (x < 0) 1277 if (x < 0)
1356 { 1278 {
1357 if (!tile_path[3]) 1279 if (!tile_available (3))
1358 return 0; 1280 return 0;
1359 1281
1360 find_and_link (this, 3);
1361 x += tile_map[3]->width; 1282 x += tile_map[3]->width;
1362 return tile_map[3]->xy_find (x, y); 1283 return tile_map[3]->xy_find (x, y);
1363 } 1284 }
1364 1285
1365 if (x >= width) 1286 if (x >= width)
1366 { 1287 {
1367 if (!tile_path[1]) 1288 if (!tile_available (1))
1368 return 0; 1289 return 0;
1369 1290
1370 find_and_link (this, 1);
1371 x -= width; 1291 x -= width;
1372 return tile_map[1]->xy_find (x, y); 1292 return tile_map[1]->xy_find (x, y);
1373 } 1293 }
1374 1294
1375 if (y < 0) 1295 if (y < 0)
1376 { 1296 {
1377 if (!tile_path[0]) 1297 if (!tile_available (0))
1378 return 0; 1298 return 0;
1379 1299
1380 find_and_link (this, 0);
1381 y += tile_map[0]->height; 1300 y += tile_map[0]->height;
1382 return tile_map[0]->xy_find (x, y); 1301 return tile_map[0]->xy_find (x, y);
1383 } 1302 }
1384 1303
1385 if (y >= height) 1304 if (y >= height)
1386 { 1305 {
1387 if (!tile_path[2]) 1306 if (!tile_available (2))
1388 return 0; 1307 return 0;
1389 1308
1390 find_and_link (this, 2);
1391 y -= height; 1309 y -= height;
1392 return tile_map[2]->xy_find (x, y); 1310 return tile_map[2]->xy_find (x, y);
1393 } 1311 }
1394 1312
1395 /* Simple case - coordinates are within this local 1313 /* Simple case - coordinates are within this local
… …
1406adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1407{ 1325{
1408 if (!map1 || !map2) 1326 if (!map1 || !map2)
1409 return 0; 1327 return 0;
1410 1328
1411 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded 1329 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1412 //fix: compare paths instead (this is likely faster, too!) 1330 //fix: compare paths instead (this is likely faster, too!)
1413 if (map1 == map2) 1331 if (map1 == map2)
1414 { 1332 {
1415 *dx = 0; 1333 *dx = 0;
1416 *dy = 0; 1334 *dy = 0;
… …
1670 1588
1671 // instead of crashing in the unlikely(?) case, try to return *something* 1589 // instead of crashing in the unlikely(?) case, try to return *something*
1672 return get_archetype ("blocked"); 1590 return get_archetype ("blocked");
1673} 1591}
1674 1592
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 1593void
1683maptile::play_sound (faceidx sound, int x, int y) const 1594maptile::play_sound (faceidx sound, int x, int y) const
1684{ 1595{
1685 if (!sound) 1596 if (!sound)
1686 return; 1597 return;
1687 1598
1688 for_all_players (pl) 1599 for_all_players (pl)
1689 if (pl->ob->map == this) 1600 if (pl->observe->map == this)
1690 if (client *ns = pl->ns) 1601 if (client *ns = pl->ns)
1691 { 1602 {
1692 int dx = x - pl->ob->x; 1603 int dx = x - pl->observe->x;
1693 int dy = y - pl->ob->y; 1604 int dy = y - pl->observe->y;
1694 1605
1695 int distance = idistance (dx, dy); 1606 int distance = idistance (dx, dy);
1696 1607
1697 if (distance <= MAX_SOUND_DISTANCE) 1608 if (distance <= MAX_SOUND_DISTANCE)
1698 ns->play_sound (sound, dx, dy); 1609 ns->play_sound (sound, dx, dy);

Diff Legend

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