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.206 by root, Wed May 4 16:12:15 2011 UTC vs.
Revision 1.213 by root, Sat May 7 20:03:27 2011 UTC

… …
369 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
370 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
371 op->activate_recursive (); 371 op->activate_recursive ();
372 372
373 state = MAP_ACTIVE; 373 state = MAP_ACTIVE;
374
375 activate_physics ();
374} 376}
375 377
376void 378void
377maptile::deactivate () 379maptile::deactivate ()
378{ 380{
… …
669 case KW_value: case KW_swap_time: thawer.get (timeout); break; 671 case KW_value: case KW_swap_time: thawer.get (timeout); break;
670 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;
671 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 673 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
672 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;
673 675
674 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
675 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
676 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
677 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
678 case KW_tile_path_5: thawer.get (tile_path [4]); break; 680 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
679 case KW_tile_path_6: thawer.get (tile_path [5]); break; 681 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
680 682
681 case KW_ERROR: 683 case KW_ERROR:
682 set_key_text (thawer.kw_str, thawer.value); 684 set_key_text (thawer.kw_str, thawer.value);
683 break; 685 break;
684 686
… …
763 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); 765 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
764 766
765 MAP_OUT (per_player); 767 MAP_OUT (per_player);
766 MAP_OUT (per_party); 768 MAP_OUT (per_party);
767 769
768 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]);
769 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 ]);
770 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]);
771 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 ]);
772 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 ]);
773 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 ]);
774 776
775 freezer.put (this); 777 freezer.put (this);
776 freezer.put (KW(end)); 778 freezer.put (KW(end));
777 779
778 return true; 780 return true;
… …
835 msg = 0; 837 msg = 0;
836 maplore = 0; 838 maplore = 0;
837 shoprace = 0; 839 shoprace = 0;
838 delete [] shopitems, shopitems = 0; 840 delete [] shopitems, shopitems = 0;
839 841
840 for (int i = 0; i < TILE_NUM; i++) 842 for (int i = 0; i < array_length (tile_path); i++)
841 tile_path [i] = 0; 843 tile_path [i] = 0;
842} 844}
843 845
844maptile::~maptile () 846maptile::~maptile ()
845{ 847{
… …
852 /* 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
853 * are pointing at this one for tiling information. Since 855 * are pointing at this one for tiling information. Since
854 * 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
855 * maps this map tiles with and clears those. 857 * maps this map tiles with and clears those.
856 */ 858 */
857 for (int i = 0; i < TILE_NUM; i++) 859 for (int i = 0; i < array_length (tile_path); i++)
858 if (tile_map[i] == m) 860 if (tile_map[i] == m)
859 tile_map[i] = 0; 861 tile_map[i] = 0;
860} 862}
861 863
862void 864void
… …
1193 middle = 0; 1195 middle = 0;
1194 1196
1195 if (top == middle) 1197 if (top == middle)
1196 middle = 0; 1198 middle = 0;
1197 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
1198#if 0 1223#if 0
1199 faces_obj [0] = top; 1224 faces_obj [0] = top;
1200 faces_obj [1] = middle; 1225 faces_obj [1] = middle;
1201 faces_obj [2] = floor; 1226 faces_obj [2] = floor;
1202#endif 1227#endif
1203} 1228}
1204 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
1205maptile * 1244maptile *
1206maptile::tile_available (int dir, bool load) 1245maptile::tile_available (int dir, bool load)
1207{ 1246{
1208 if (tile_path[dir])
1209 {
1210 // 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
1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ())) 1248 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1212 return tile_map[dir]; 1249 return tile_map [dir];
1213 1250
1251 if (tile_path [dir])
1252 {
1214 // 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
1215 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
1216 return tile_map[dir]; 1276 return tile_map [dir] = m;
1277 }
1217 } 1278 }
1218 1279
1219 return 0; 1280 return 0;
1220} 1281}
1221 1282
… …
1237 if (!m) 1298 if (!m)
1238 return 0; 1299 return 0;
1239 1300
1240 if (x < 0) 1301 if (x < 0)
1241 { 1302 {
1242 if (!m->tile_available (3)) 1303 if (!m->tile_available (TILE_WEST))
1243 return 1; 1304 return 1;
1244 1305
1245 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);
1246 } 1307 }
1247 1308
1248 if (x >= m->width) 1309 if (x >= m->width)
1249 { 1310 {
1250 if (!m->tile_available (1)) 1311 if (!m->tile_available (TILE_EAST))
1251 return 1; 1312 return 1;
1252 1313
1253 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);
1254 } 1315 }
1255 1316
1256 if (y < 0) 1317 if (y < 0)
1257 { 1318 {
1258 if (!m->tile_available (0)) 1319 if (!m->tile_available (TILE_NORTH))
1259 return 1; 1320 return 1;
1260 1321
1261 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);
1262 } 1323 }
1263 1324
1264 if (y >= m->height) 1325 if (y >= m->height)
1265 { 1326 {
1266 if (!m->tile_available (2)) 1327 if (!m->tile_available (TILE_SOUTH))
1267 return 1; 1328 return 1;
1268 1329
1269 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);
1270 } 1331 }
1271 1332
1272 /* Simple case - coordinates are within this local 1333 /* Simple case - coordinates are within this local
1273 * map. 1334 * map.
1274 */ 1335 */
… …
1286maptile * 1347maptile *
1287maptile::xy_find (sint16 &x, sint16 &y) 1348maptile::xy_find (sint16 &x, sint16 &y)
1288{ 1349{
1289 if (x < 0) 1350 if (x < 0)
1290 { 1351 {
1291 if (!tile_available (3)) 1352 if (!tile_available (TILE_WEST))
1292 return 0; 1353 return 0;
1293 1354
1294 x += tile_map[3]->width; 1355 x += tile_map [TILE_WEST]->width;
1295 return tile_map[3]->xy_find (x, y); 1356 return tile_map [TILE_WEST]->xy_find (x, y);
1296 } 1357 }
1297 1358
1298 if (x >= width) 1359 if (x >= width)
1299 { 1360 {
1300 if (!tile_available (1)) 1361 if (!tile_available (TILE_EAST))
1301 return 0; 1362 return 0;
1302 1363
1303 x -= width; 1364 x -= width;
1304 return tile_map[1]->xy_find (x, y); 1365 return tile_map [TILE_EAST]->xy_find (x, y);
1305 } 1366 }
1306 1367
1307 if (y < 0) 1368 if (y < 0)
1308 { 1369 {
1309 if (!tile_available (0)) 1370 if (!tile_available (TILE_NORTH))
1310 return 0; 1371 return 0;
1311 1372
1312 y += tile_map[0]->height; 1373 y += tile_map [TILE_NORTH]->height;
1313 return tile_map[0]->xy_find (x, y); 1374 return tile_map [TILE_NORTH]->xy_find (x, y);
1314 } 1375 }
1315 1376
1316 if (y >= height) 1377 if (y >= height)
1317 { 1378 {
1318 if (!tile_available (2)) 1379 if (!tile_available (TILE_SOUTH))
1319 return 0; 1380 return 0;
1320 1381
1321 y -= height; 1382 y -= height;
1322 return tile_map[2]->xy_find (x, y); 1383 return tile_map [TILE_SOUTH]->xy_find (x, y);
1323 } 1384 }
1324 1385
1325 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
1326 * map. 1387 * map.
1327 */ 1388 */

Diff Legend

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