| … | |
… | |
| 313 | /* Match the enumerations but in string form */ |
313 | /* Match the enumerations but in string form */ |
| 314 | fprintf (freezer, "unapply %s\n", pl->unapply == unapply_nochoice ? "unapply_nochoice" : |
314 | fprintf (freezer, "unapply %s\n", pl->unapply == unapply_nochoice ? "unapply_nochoice" : |
| 315 | (pl->unapply == unapply_never ? "unapply_never" : "unapply_always")); |
315 | (pl->unapply == unapply_never ? "unapply_never" : "unapply_always")); |
| 316 | |
316 | |
| 317 | #ifdef BACKUP_SAVE_AT_HOME |
317 | #ifdef BACKUP_SAVE_AT_HOME |
| 318 | if (op->map != NULL && flag == 0) |
318 | if (op->map && flag == 0) |
| 319 | #else |
319 | #else |
| 320 | if (op->map != NULL) |
320 | if (op->map) |
| 321 | #endif |
321 | #endif |
| 322 | fprintf (freezer, "map %s\n", op->map->path); |
322 | fprintf (freezer, "map %s\n", op->map->path); |
| 323 | else |
323 | else |
| 324 | fprintf (freezer, "map %s\n", settings.emergency_mapname); |
324 | fprintf (freezer, "map %s\n", settings.emergency_mapname); |
| 325 | |
325 | |
| … | |
… | |
| 607 | * restart them on their home-savebed. This is good for when |
607 | * restart them on their home-savebed. This is good for when |
| 608 | * maps change between versions |
608 | * maps change between versions |
| 609 | * First, we check for partial path, then check to see if the full |
609 | * First, we check for partial path, then check to see if the full |
| 610 | * path (for unique player maps) |
610 | * path (for unique player maps) |
| 611 | */ |
611 | */ |
|
|
612 | if (!has_been_loaded (pl->maplevel) |
| 612 | if (check_path (pl->maplevel, 1) == -1) |
613 | && check_path (pl->maplevel, 1) == -1 |
| 613 | { |
|
|
| 614 | if (check_path (pl->maplevel, 0) == -1) |
614 | && check_path (pl->maplevel, 0) == -1) |
| 615 | { |
615 | { |
| 616 | strcpy (pl->maplevel, pl->savebed_map); |
616 | strcpy (pl->maplevel, pl->savebed_map); |
| 617 | op->x = pl->bed_x, op->y = pl->bed_y; |
617 | op->x = pl->bed_x, op->y = pl->bed_y; |
| 618 | } |
|
|
| 619 | } |
618 | } |
| 620 | |
619 | |
| 621 | /* make sure he's a player--needed because of class change. */ |
620 | /* make sure he's a player--needed because of class change. */ |
| 622 | op->type = PLAYER; |
621 | op->type = PLAYER; |
| 623 | |
622 | |
