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.117 by root, Fri Aug 24 00:26:09 2007 UTC vs.
Revision 1.131 by root, Thu Oct 4 11:48:06 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
… …
332 if (object *op = object::read (f, this)) 317 if (object *op = object::read (f, this))
333 { 318 {
334 if (op->inv) 319 if (op->inv)
335 sum_weight (op); 320 sum_weight (op);
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:
… …
383 if (!spaces) 393 if (!spaces)
384 return false; 394 return false;
385 395
386 for (int i = 0; i < size (); ++i) 396 for (int i = 0; i < size (); ++i)
387 { 397 {
388 int unique = 0; 398 bool unique = 0;
399
389 for (object *op = spaces [i].bot; op; op = op->above) 400 for (object *op = spaces [i].bot; op; op = op->above)
390 { 401 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 402 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 403
394 if (!op->can_map_save ()) 404 if (expect_false (!op->can_map_save ()))
395 continue; 405 continue;
396 406
397 if (unique || op->flag [FLAG_UNIQUE]) 407 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 408 {
399 if (flags & IO_UNIQUES) 409 if (flags & IO_UNIQUES)
400 op->write (f); 410 op->write (f);
401 } 411 }
402 else if (flags & IO_OBJECTS) 412 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 413 op->write (f);
404 } 414 }
405 } 415 }
406 416
407 coroapi::cede_to_tick (); 417 coroapi::cede_to_tick ();
408 418
409 return true; 419 return true;
410}
411
412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432} 420}
433 421
434bool 422bool
435maptile::_save_objects (const char *path, int flags) 423maptile::_save_objects (const char *path, int flags)
436{ 424{
… …
611bool 599bool
612maptile::_load_header (object_thawer &thawer) 600maptile::_load_header (object_thawer &thawer)
613{ 601{
614 for (;;) 602 for (;;)
615 { 603 {
616 thawer.next ();
617
618 switch (thawer.kw) 604 switch (thawer.kw)
619 { 605 {
620 case KW_msg: 606 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 607 thawer.get_ml (KW_endmsg, msg);
622 break; 608 break;
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 663 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 664 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 665 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 666
681 case KW_ERROR: 667 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 668 set_key_text (thawer.kw_str, thawer.value);
683 break; 669 break;
684 670
685 case KW_end: 671 case KW_end:
672 thawer.next ();
686 return true; 673 return true;
687 674
688 default: 675 default:
689 if (!thawer.parse_error ("map", 0)) 676 if (!thawer.parse_error ("map", 0))
690 return false; 677 return false;
691 break; 678 break;
692 } 679 }
680
681 thawer.next ();
693 } 682 }
694 683
695 abort (); 684 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 685}
708 686
709/****************************************************************************** 687/******************************************************************************
710 * This is the start of unique map handling code 688 * This is the start of unique map handling code
711 *****************************************************************************/ 689 *****************************************************************************/
… …
810 * Remove and free all objects in the given map. 788 * Remove and free all objects in the given map.
811 */ 789 */
812void 790void
813maptile::clear () 791maptile::clear ()
814{ 792{
815 sfree (regions, size ()); regions = 0;
816 delete [] regionmap; regionmap = 0;
817
818 if (spaces) 793 if (spaces)
819 { 794 {
820 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 795 for (mapspace *ms = spaces + size (); ms-- > spaces; )
821 while (object *op = ms->bot) 796 while (object *op = ms->bot)
822 { 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
823 op = op->head_ (); 804 object *head = op->head_ ();
805 if (op == head)
806 {
824 op->destroy_inv (false); 807 op->destroy_inv (false);
825 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 }
826 } 815 }
827 816
828 sfree (spaces, size ()), spaces = 0; 817 sfree (spaces, size ()), spaces = 0;
829 } 818 }
830 819
831 if (buttons) 820 if (buttons)
832 free_objectlinkpt (buttons), buttons = 0; 821 free_objectlinkpt (buttons), buttons = 0;
822
823 sfree (regions, size ()); regions = 0;
824 delete [] regionmap; regionmap = 0;
833} 825}
834 826
835void 827void
836maptile::clear_header () 828maptile::clear_header ()
837{ 829{
… …
889 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))
890 break; 882 break;
891 883
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 884 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 885 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 886 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 887 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 888 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 889 || op->is_alive ())
899 ; // do not decay 890 ; // do not decay
… …
1227} 1218}
1228 1219
1229bool 1220bool
1230maptile::tile_available (int dir, bool load) 1221maptile::tile_available (int dir, bool load)
1231{ 1222{
1223 if (!tile_path[dir])
1224 return 0;
1225
1232 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY))
1233 return 1; 1227 return 1;
1234
1235 if (!tile_path[dir])
1236 return 0;
1237 1228
1238 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1239 return 1; 1230 return 1;
1240 1231
1241 return 0; 1232 return 0;
… …
1259 if (!m) 1250 if (!m)
1260 return 0; 1251 return 0;
1261 1252
1262 if (x < 0) 1253 if (x < 0)
1263 { 1254 {
1264 if (!m->tile_available (3, 0)) 1255 if (!m->tile_available (3))
1265 return 1; 1256 return 1;
1266 1257
1267 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);
1268 } 1259 }
1269 1260
1270 if (x >= m->width) 1261 if (x >= m->width)
1271 { 1262 {
1272 if (!m->tile_available (1, 0)) 1263 if (!m->tile_available (1))
1273 return 1; 1264 return 1;
1274 1265
1275 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);
1276 } 1267 }
1277 1268
1278 if (y < 0) 1269 if (y < 0)
1279 { 1270 {
1280 if (!m->tile_available (0, 0)) 1271 if (!m->tile_available (0))
1281 return 1; 1272 return 1;
1282 1273
1283 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);
1284 } 1275 }
1285 1276
1286 if (y >= m->height) 1277 if (y >= m->height)
1287 { 1278 {
1288 if (!m->tile_available (2, 0)) 1279 if (!m->tile_available (2))
1289 return 1; 1280 return 1;
1290 1281
1291 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);
1292 } 1283 }
1293 1284
… …
1308maptile * 1299maptile *
1309maptile::xy_find (sint16 &x, sint16 &y) 1300maptile::xy_find (sint16 &x, sint16 &y)
1310{ 1301{
1311 if (x < 0) 1302 if (x < 0)
1312 { 1303 {
1313 if (!tile_available (3, 1)) 1304 if (!tile_available (3))
1314 return 0; 1305 return 0;
1315 1306
1316 x += tile_map[3]->width; 1307 x += tile_map[3]->width;
1317 return tile_map[3]->xy_find (x, y); 1308 return tile_map[3]->xy_find (x, y);
1318 } 1309 }
1319 1310
1320 if (x >= width) 1311 if (x >= width)
1321 { 1312 {
1322 if (!tile_available (1, 1)) 1313 if (!tile_available (1))
1323 return 0; 1314 return 0;
1324 1315
1325 x -= width; 1316 x -= width;
1326 return tile_map[1]->xy_find (x, y); 1317 return tile_map[1]->xy_find (x, y);
1327 } 1318 }
1328 1319
1329 if (y < 0) 1320 if (y < 0)
1330 { 1321 {
1331 if (!tile_available (0, 1)) 1322 if (!tile_available (0))
1332 return 0; 1323 return 0;
1333 1324
1334 y += tile_map[0]->height; 1325 y += tile_map[0]->height;
1335 return tile_map[0]->xy_find (x, y); 1326 return tile_map[0]->xy_find (x, y);
1336 } 1327 }
1337 1328
1338 if (y >= height) 1329 if (y >= height)
1339 { 1330 {
1340 if (!tile_available (2, 1)) 1331 if (!tile_available (2))
1341 return 0; 1332 return 0;
1342 1333
1343 y -= height; 1334 y -= height;
1344 return tile_map[2]->xy_find (x, y); 1335 return tile_map[2]->xy_find (x, y);
1345 } 1336 }
… …
1358adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1349adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1359{ 1350{
1360 if (!map1 || !map2) 1351 if (!map1 || !map2)
1361 return 0; 1352 return 0;
1362 1353
1363 //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
1364 //fix: compare paths instead (this is likely faster, too!) 1355 //fix: compare paths instead (this is likely faster, too!)
1365 if (map1 == map2) 1356 if (map1 == map2)
1366 { 1357 {
1367 *dx = 0; 1358 *dx = 0;
1368 *dy = 0; 1359 *dy = 0;

Diff Legend

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