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.56 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.57 by root, Sat Dec 30 15:07:58 2006 UTC

1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1327} 1327}
1328 1328
1329void
1330set_map_reset_time (maptile *map)
1331{
1332 int timeout = map->reset_timeout;
1333
1334 if (timeout <= 0)
1335 timeout = MAP_DEFAULTRESET;
1336 if (timeout >= MAP_MAXRESET)
1337 timeout = MAP_MAXRESET;
1338
1339 map->reset_time = time (0) + timeout;
1340}
1341
1342/* this updates the orig_map->tile_map[tile_num] value after loading 1329/* this updates the orig_map->tile_map[tile_num] value after loading
1343 * the map. It also takes care of linking back the freshly loaded 1330 * the map. It also takes care of linking back the freshly loaded
1344 * maps tile_map values if it tiles back to this one. It returns 1331 * maps tile_map values if it tiles back to this one. It returns
1345 * the value of orig_map->tile_map[tile_num]. It really only does this 1332 * the value of orig_map->tile_map[tile_num]. It really only does this
1346 * so that it is easier for calling functions to verify success. 1333 * so that it is easier for calling functions to verify success.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines