| version 1.76 | | version 1.77 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_map_c = | | * static char *rcsid_map_c = |
| * "$Id: map.c,v 1.76 2005/07/17 11:00:03 ryo_saeba Exp $"; | | * "$Id: map.c,v 1.77 2005/08/27 21:42:06 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| */ | | */ |
| MAP_WIDTH(map)=16; | | MAP_WIDTH(map)=16; |
| MAP_HEIGHT(map)=16; | | MAP_HEIGHT(map)=16; |
| MAP_RESET_TIMEOUT(map)=7200; | | MAP_RESET_TIMEOUT(map)=0; |
| MAP_TIMEOUT(map)=300; | | MAP_TIMEOUT(map)=300; |
| /* Gah - these should really have a zero default! */ | | MAP_ENTER_X(map)=0; |
| MAP_ENTER_X(map)=1; | | MAP_ENTER_Y(map)=0; |
| MAP_ENTER_Y(map)=1; | | |
| /*set part to -1 indicating conversion to weather map not yet done*/ | | /*set part to -1 indicating conversion to weather map not yet done*/ |
| MAP_WORLDPARTX(map)=-1; | | MAP_WORLDPARTX(map)=-1; |
| MAP_WORLDPARTY(map)=-1; | | MAP_WORLDPARTY(map)=-1; |
| | |
| | | |
| | | |
| void set_map_reset_time(mapstruct *map) { | | void set_map_reset_time(mapstruct *map) { |
| if (MAP_RESET_TIMEOUT(map)>MAP_MAXRESET) | | int timeout; |
| MAP_WHEN_RESET(map) = seconds() + MAP_MAXRESET; | | |
| else | | timeout = MAP_RESET_TIMEOUT(map); |
| MAP_WHEN_RESET(map) = seconds() + MAP_RESET_TIMEOUT (map); | | if (timeout <= 0) |
| | | timeout = MAP_DEFAULTRESET; |
| | | if (timeout >= MAP_MAXRESET) |
| | | timeout = MAP_MAXRESET; |
| | | MAP_WHEN_RESET(map) = seconds()+timeout; |
| } | | } |
| | | |
| /* this updates the orig_map->tile_map[tile_num] value after loading | | /* this updates the orig_map->tile_map[tile_num] value after loading |