| version 1.13 | | version 1.14 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_main_c = | | * static char *rcsid_main_c = |
| * "$Id: main.c,v 1.13 2000/11/14 07:35:06 cvs Exp $"; | | * "$Id: main.c,v 1.14 2000/11/23 07:32:47 cvs Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| oldmap->players--; | | oldmap->players--; |
| } | | } |
| | | |
| | | /* If a unique loaded, see if its in memory, and use it. |
| | | * otherwise, load it up. |
| | | */ |
| | | if (exit_ob && QUERY_FLAG(exit_ob, FLAG_UNIQUE)) { |
| | | op->map=has_been_loaded(apartment); |
| | | if (!op->map || |
| | | (op->map->in_memory!=MAP_LOADING && op->map->in_memory!=MAP_IN_MEMORY)) |
| | | op->map = ready_map_name(newpath,(unique?MAP_PLAYER_UNIQUE:0)); |
| | | } else { |
| /* Do any processing to get the map loaded and ready */ | | /* Do any processing to get the map loaded and ready */ |
| op->map = ready_map_name(newpath,(unique?MAP_PLAYER_UNIQUE:0)); | | op->map = ready_map_name(newpath,(unique?MAP_PLAYER_UNIQUE:0)); |
| | | } |
| | | |
| /* Did the load fail for some reason? If so, put the player back on the | | /* Did the load fail for some reason? If so, put the player back on the |
| * map they came from and remove the exit that pointed the player to | | * map they came from and remove the exit that pointed the player to |
| | |
| /* If we got the map we wanted and it is UNIQUE, we need to update | | /* If we got the map we wanted and it is UNIQUE, we need to update |
| * it so it gets saved in the right place. Set unique so that | | * it so it gets saved in the right place. Set unique so that |
| * when we save it, it knows to save it in the right place | | * when we save it, it knows to save it in the right place |
| | | * If the map is already in ram, this is redundant, but not a big |
| | | * problem. |
| */ | | */ |
| else if (exit_ob && QUERY_FLAG(exit_ob, FLAG_UNIQUE)) { | | else if (exit_ob && QUERY_FLAG(exit_ob, FLAG_UNIQUE)) { |
| strcpy(op->map->path, apartment); | | strcpy(op->map->path, apartment); |
| | |
| | | |
| void process_events (mapstruct *map) | | void process_events (mapstruct *map) |
| { | | { |
| object *op, *next; | | object *op; |
| object marker; | | object marker; |
| tag_t tag; | | tag_t tag; |
| | | |