| version 1.60 | | version 1.61 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_main_c = | | * static char *rcsid_main_c = |
| * "$Id: main.c,v 1.60 2002/06/14 03:59:38 mwedel Exp $"; | | * "$Id: main.c,v 1.61 2002/06/15 07:47:36 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| * while we're at it. | | * while we're at it. |
| */ | | */ |
| if (oldmap == op->map && strcmp(op->contr->savebed_map, oldmap->path)) { | | if (oldmap == op->map && strcmp(op->contr->savebed_map, oldmap->path)) { |
| LOG(llevDebug,"Player %s savebed location %s is invalid - going to EMERGENCY_MAPPATH\n", | | LOG(llevDebug,"Player %s savebed location %s is invalid - going to emergency location (%s)\n", |
| op->name, op->contr->savebed_map); | | settings.emergency_mapname, op->name, op->contr->savebed_map); |
| strcpy(op->contr->savebed_map, EMERGENCY_MAPPATH); | | strcpy(op->contr->savebed_map, settings.emergency_mapname); |
| op->contr->bed_x = EMERGENCY_X; | | op->contr->bed_x = settings.emergency_x; |
| op->contr->bed_y = EMERGENCY_Y; | | op->contr->bed_y = settings.emergency_y; |
| free_string(op->contr->savebed_map); | | free_string(op->contr->savebed_map); |
| EXIT_PATH(tmp) = add_string(op->contr->savebed_map); | | EXIT_PATH(tmp) = add_string(op->contr->savebed_map); |
| EXIT_X(tmp) = op->contr->bed_x; | | EXIT_X(tmp) = op->contr->bed_x; |
| | |
| newmap = ready_map_name(op->contr->maplevel, flags); | | newmap = ready_map_name(op->contr->maplevel, flags); |
| if (!newmap) { | | if (!newmap) { |
| LOG(llevError,"enter_exit: Pathname to map does not exist! (%s)\n", op->contr->maplevel); | | LOG(llevError,"enter_exit: Pathname to map does not exist! (%s)\n", op->contr->maplevel); |
| newmap = ready_map_name(EMERGENCY_MAPPATH, 0); | | newmap = ready_map_name(settings.emergency_mapname, 0); |
| op->x = EMERGENCY_X; | | op->x = settings.emergency_x; |
| op->y = EMERGENCY_Y; | | op->y = settings.emergency_y; |
| /* If we can't load the emergency map, something is probably really | | /* If we can't load the emergency map, something is probably really |
| * screwed up, so bail out now. | | * screwed up, so bail out now. |
| */ | | */ |