aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCara Salter <cara@devcara.com>2022-01-27 10:54:55 -0500
committerCara Salter <cara@devcara.com>2022-01-27 10:54:55 -0500
commitae68415af5c333d2c7a7f701ba99df6224e925a9 (patch)
tree92f5dfc8e2569bc4d05761b905b4578e880ac91a
parent98495cca395ce9582e0eedb6a649862765e7281e (diff)
downloadcmud-ae68415af5c333d2c7a7f701ba99df6224e925a9.tar.gz
cmud-ae68415af5c333d2c7a7f701ba99df6224e925a9.zip
data: Make it clearer that we're testing for a null file pointer
Signed-off-by: Cara Salter <cara@devcara.com>
-rw-r--r--src/data.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/data.c b/src/data.c
index 40de076..dabdee7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -36,12 +36,20 @@ int try_load_plr(char *player_name, playerc_t *plr) {
char *fname;
asprintf(&fname, "data/players/%s.plr", player_name);
- FILE *fp = fopen(fname, "rb");
- printf("Got fp\n");
+ FILE *fp;
- fread(&plr, sizeof(playerc_t), 1, fp);
+ if (fp = fopen(fname, "rb")) {
+ printf("%p", fp);
+
+ printf("Got fp\n");
+
+ fread(&plr->plr, sizeof(player_t), 1, fp);
+ } else {
+ return 4; // File doesn't exist
+ }
printf("Read file into plr\n");
+ fclose(fp);
return err;
}