diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-02-05 19:22:46 +0100 |
| commit | 36a0eb00994b1347de5fbac13b6a3901f755ec27 (patch) | |
| tree | 86d8e59129a222dd0cd29a053be2936ac2eda439 /src/loadsave.cc | |
| parent | 59b27fb6541811842a4d7e30daa6229c821d7d42 (diff) | |
Clean up load_player() a little
Diffstat (limited to 'src/loadsave.cc')
| -rw-r--r-- | src/loadsave.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/loadsave.cc b/src/loadsave.cc index 1806d7c8..4c313901 100644 --- a/src/loadsave.cc +++ b/src/loadsave.cc @@ -2727,8 +2727,6 @@ static errr rd_savefile(void) */ bool_ load_player(void) { - int fd = -1; - errr err = 0; cptr what = "generic"; @@ -2761,13 +2759,16 @@ bool_ load_player(void) if (!err) { /* Open the savefile */ - fd = fd_open(savefile, O_RDONLY); + int fd = fd_open(savefile, O_RDONLY); /* No file */ if (fd < 0) err = -1; /* Message (below) */ if (err) what = "Cannot open savefile"; + + /* Close the file */ + if (!err) fd_close(fd); } /* Process file */ @@ -2777,18 +2778,13 @@ bool_ load_player(void) /* Open the file XXX XXX XXX XXX Should use Angband file interface */ fff = my_fopen(savefile, "rb"); -/* fff = fdopen(fd, "r"); */ /* Read the first four bytes */ do_u32b(&vernum, ls_flag_t::LOAD); do_byte(&tmp8u, ls_flag_t::LOAD); // For comatibility with old savefiles - /* XXX XXX XXX XXX Should use Angband file interface */ my_fclose(fff); - /* fclose(fff) */ - /* Close the file */ - fd_close(fd); } /* Process file */ |