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.202 by root, Fri Apr 22 06:10:32 2011 UTC vs.
Revision 1.213 by root, Sat May 7 20:03:27 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
361} 361}
362 362
363void 363void
364maptile::activate () 364maptile::activate ()
365{ 365{
366 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
367 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
368 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
369 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
374
375 activate_physics ();
370} 376}
371 377
372void 378void
373maptile::deactivate () 379maptile::deactivate ()
374{ 380{
375 if (spaces) 381 if (state != MAP_ACTIVE)
382 return;
383
376 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 384 for (mapspace *ms = spaces + size (); ms-- > spaces; )
377 for (object *op = ms->bot; op; op = op->above) 385 for (object *op = ms->bot; op; op = op->above)
378 op->deactivate_recursive (); 386 op->deactivate_recursive ();
387
388 state = MAP_INACTIVE;
379} 389}
380 390
381bool 391bool
382maptile::_save_objects (object_freezer &f, int flags) 392maptile::_save_objects (object_freezer &f, int flags)
383{ 393{
… …
427} 437}
428 438
429void 439void
430maptile::init () 440maptile::init ()
431{ 441{
432 in_memory = MAP_SWAPPED; 442 state = MAP_SWAPPED;
433 443
434 /* The maps used to pick up default x and y values from the 444 /* The maps used to pick up default x and y values from the
435 * map archetype. Mimic that behaviour. 445 * map archetype. Mimic that behaviour.
436 */ 446 */
437 width = 16; 447 width = 16;
… …
661 case KW_value: case KW_swap_time: thawer.get (timeout); break; 671 case KW_value: case KW_swap_time: thawer.get (timeout); break;
662 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; 672 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
663 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 673 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
664 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; 674 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
665 675
666 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
667 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
668 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
669 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
670 case KW_tile_path_5: thawer.get (tile_path [4]); break; 680 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
671 case KW_tile_path_6: thawer.get (tile_path [5]); break; 681 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
672 682
673 case KW_ERROR: 683 case KW_ERROR:
674 set_key_text (thawer.kw_str, thawer.value); 684 set_key_text (thawer.kw_str, thawer.value);
675 break; 685 break;
676 686
… …
755 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); 765 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
756 766
757 MAP_OUT (per_player); 767 MAP_OUT (per_player);
758 MAP_OUT (per_party); 768 MAP_OUT (per_party);
759 769
760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 770 if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 771 if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 772 if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 773 if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
764 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]); 774 if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
765 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]); 775 if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
766 776
767 freezer.put (this); 777 freezer.put (this);
768 freezer.put (KW(end)); 778 freezer.put (KW(end));
769 779
770 return true; 780 return true;
… …
827 msg = 0; 837 msg = 0;
828 maplore = 0; 838 maplore = 0;
829 shoprace = 0; 839 shoprace = 0;
830 delete [] shopitems, shopitems = 0; 840 delete [] shopitems, shopitems = 0;
831 841
832 for (int i = 0; i < TILE_NUM; i++) 842 for (int i = 0; i < array_length (tile_path); i++)
833 tile_path [i] = 0; 843 tile_path [i] = 0;
834} 844}
835 845
836maptile::~maptile () 846maptile::~maptile ()
837{ 847{
… …
844 /* We need to look through all the maps and see if any maps 854 /* We need to look through all the maps and see if any maps
845 * are pointing at this one for tiling information. Since 855 * are pointing at this one for tiling information. Since
846 * tiling can be asymetric, we just can not look to see which 856 * tiling can be asymetric, we just can not look to see which
847 * maps this map tiles with and clears those. 857 * maps this map tiles with and clears those.
848 */ 858 */
849 for (int i = 0; i < 4; i++) 859 for (int i = 0; i < array_length (tile_path); i++)
850 if (tile_map[i] == m) 860 if (tile_map[i] == m)
851 tile_map[i] = 0; 861 tile_map[i] = 0;
852} 862}
853 863
854void 864void
… …
1185 middle = 0; 1195 middle = 0;
1186 1196
1187 if (top == middle) 1197 if (top == middle)
1188 middle = 0; 1198 middle = 0;
1189 1199
1200 // set lower map transparent floor flag if applicable
1201 if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
1202 {
1203 floor->set_anim_frame (0);
1204
1205 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1206 {
1207 mapspace &ms = m->at (floor->x, floor->y);
1208 ms.update ();
1209
1210 if (object *floor2 = ms.faces_obj [2])
1211 if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
1212 {
1213 floor->set_anim_frame (1);
1214 top = floor;
1215 middle = ms.faces_obj [0];
1216 floor = floor2;
1217 }
1218
1219 ms.pflags |= PF_VIS_UP;
1220 }
1221 }
1222
1190#if 0 1223#if 0
1191 faces_obj [0] = top; 1224 faces_obj [0] = top;
1192 faces_obj [1] = middle; 1225 faces_obj [1] = middle;
1193 faces_obj [2] = floor; 1226 faces_obj [2] = floor;
1194#endif 1227#endif
1195} 1228}
1196 1229
1230void
1231mapspace::update_up ()
1232{
1233 // invalidate up
1234 if (!(pflags & PF_VIS_UP))
1235 return;
1236
1237 pflags &= ~PF_VIS_UP;
1238
1239 if (bot)
1240 if (maptile *m = bot->map->tile_map [TILE_UP])
1241 m->at (bot->x, bot->y).invalidate ();
1242}
1243
1197maptile * 1244maptile *
1198maptile::tile_available (int dir, bool load) 1245maptile::tile_available (int dir, bool load)
1199{ 1246{
1200 if (tile_path[dir])
1201 {
1202 // map is there and we don't need to load it OR it's loaded => return what we have 1247 // map is there and we don't need to load it OR it's loaded => return what we have
1203 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1248 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1204 return tile_map[dir]; 1249 return tile_map [dir];
1205 1250
1251 if (tile_path [dir])
1252 {
1206 // well, try to locate it then, if possible - maybe it's there already 1253 // well, try to locate it then, if possible - maybe it's there already
1207 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1254 if (maptile *m = find_async (tile_path [dir], this, load))
1255 {
1256 bool match = true;
1257
1258 if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
1259 if (width != m->width)
1260 match = false;
1261
1262 if (dir == TILE_EAST || dir == TILE_WEST || dir == TILE_UP || dir == TILE_DOWN)
1263 if (height != m->height)
1264 match = false;
1265
1266 if (!match)
1267 {
1268 LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
1269 dir, &path, &m->path);
1270 m = 0;
1271 }
1272
1273 // this could be optimised endlessly
1274 //m->activate_physics ();
1275
1208 return tile_map[dir]; 1276 return tile_map [dir] = m;
1277 }
1209 } 1278 }
1210 1279
1211 return 0; 1280 return 0;
1212} 1281}
1213 1282
… …
1229 if (!m) 1298 if (!m)
1230 return 0; 1299 return 0;
1231 1300
1232 if (x < 0) 1301 if (x < 0)
1233 { 1302 {
1234 if (!m->tile_available (3)) 1303 if (!m->tile_available (TILE_WEST))
1235 return 1; 1304 return 1;
1236 1305
1237 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1306 return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1238 } 1307 }
1239 1308
1240 if (x >= m->width) 1309 if (x >= m->width)
1241 { 1310 {
1242 if (!m->tile_available (1)) 1311 if (!m->tile_available (TILE_EAST))
1243 return 1; 1312 return 1;
1244 1313
1245 return out_of_map (m->tile_map[1], x - m->width, y); 1314 return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1246 } 1315 }
1247 1316
1248 if (y < 0) 1317 if (y < 0)
1249 { 1318 {
1250 if (!m->tile_available (0)) 1319 if (!m->tile_available (TILE_NORTH))
1251 return 1; 1320 return 1;
1252 1321
1253 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1322 return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1254 } 1323 }
1255 1324
1256 if (y >= m->height) 1325 if (y >= m->height)
1257 { 1326 {
1258 if (!m->tile_available (2)) 1327 if (!m->tile_available (TILE_SOUTH))
1259 return 1; 1328 return 1;
1260 1329
1261 return out_of_map (m->tile_map[2], x, y - m->height); 1330 return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1262 } 1331 }
1263 1332
1264 /* Simple case - coordinates are within this local 1333 /* Simple case - coordinates are within this local
1265 * map. 1334 * map.
1266 */ 1335 */
… …
1278maptile * 1347maptile *
1279maptile::xy_find (sint16 &x, sint16 &y) 1348maptile::xy_find (sint16 &x, sint16 &y)
1280{ 1349{
1281 if (x < 0) 1350 if (x < 0)
1282 { 1351 {
1283 if (!tile_available (3)) 1352 if (!tile_available (TILE_WEST))
1284 return 0; 1353 return 0;
1285 1354
1286 x += tile_map[3]->width; 1355 x += tile_map [TILE_WEST]->width;
1287 return tile_map[3]->xy_find (x, y); 1356 return tile_map [TILE_WEST]->xy_find (x, y);
1288 } 1357 }
1289 1358
1290 if (x >= width) 1359 if (x >= width)
1291 { 1360 {
1292 if (!tile_available (1)) 1361 if (!tile_available (TILE_EAST))
1293 return 0; 1362 return 0;
1294 1363
1295 x -= width; 1364 x -= width;
1296 return tile_map[1]->xy_find (x, y); 1365 return tile_map [TILE_EAST]->xy_find (x, y);
1297 } 1366 }
1298 1367
1299 if (y < 0) 1368 if (y < 0)
1300 { 1369 {
1301 if (!tile_available (0)) 1370 if (!tile_available (TILE_NORTH))
1302 return 0; 1371 return 0;
1303 1372
1304 y += tile_map[0]->height; 1373 y += tile_map [TILE_NORTH]->height;
1305 return tile_map[0]->xy_find (x, y); 1374 return tile_map [TILE_NORTH]->xy_find (x, y);
1306 } 1375 }
1307 1376
1308 if (y >= height) 1377 if (y >= height)
1309 { 1378 {
1310 if (!tile_available (2)) 1379 if (!tile_available (TILE_SOUTH))
1311 return 0; 1380 return 0;
1312 1381
1313 y -= height; 1382 y -= height;
1314 return tile_map[2]->xy_find (x, y); 1383 return tile_map [TILE_SOUTH]->xy_find (x, y);
1315 } 1384 }
1316 1385
1317 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
1318 * map. 1387 * map.
1319 */ 1388 */

Diff Legend

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