projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Repair and simplify complicated pirare-robbery logic.
[open-adventure.git]
/
saveresume.c
diff --git
a/saveresume.c
b/saveresume.c
index 03b7490638ede110252e3bf26f0b76113b83a80b..340ea65cd6dc53e3757b5485551cd521d198ba1a 100644
(file)
--- a/
saveresume.c
+++ b/
saveresume.c
@@
-40,7
+40,7
@@
int saveresume(FILE *input, bool resume)
* some points (so can't win by using saved games to retry
* battles or to start over after learning zzword). */
RSPEAK(260);
* some points (so can't win by using saved games to retry
* battles or to start over after learning zzword). */
RSPEAK(260);
- if (!YES(input,200,54,54)) return
(2012)
;
+ if (!YES(input,200,54,54)) return
GO_CLEAROBJ
;
game.saved=game.saved+5;
}
else
game.saved=game.saved+5;
}
else
@@
-48,14
+48,14
@@
int saveresume(FILE *input, bool resume)
/* Resume. Read a suspended game back from a file. */
if (game.loc != 1 || game.abbrev[1] != 1) {
RSPEAK(268);
/* Resume. Read a suspended game back from a file. */
if (game.loc != 1 || game.abbrev[1] != 1) {
RSPEAK(268);
- if (!YES(input,200,54,54)) return
(2012)
;
+ if (!YES(input,200,54,54)) return
GO_CLEAROBJ
;
}
}
while (fp == NULL) {
name = linenoise("\nFile name: ");
if (name == NULL)
}
}
while (fp == NULL) {
name = linenoise("\nFile name: ");
if (name == NULL)
- return
(2000)
;
+ return
GO_TOP
;
fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
if (fp == NULL)
printf("Can't open file %s, try again.\n", name);
fp = fopen(name,(resume ? READ_MODE : WRITE_MODE));
if (fp == NULL)
printf("Can't open file %s, try again.\n", name);
@@
-83,13
+83,13
@@
int saveresume(FILE *input, bool resume)
SETPRM(1,k/10,MOD(k,10));
SETPRM(3,VRSION/10,MOD(VRSION,10));
RSPEAK(269);
SETPRM(1,k/10,MOD(k,10));
SETPRM(3,VRSION/10,MOD(VRSION,10));
RSPEAK(269);
- return(2000);
+ } else {
+ memcpy(&game, &save.game, sizeof(struct game_t));
+ OBJSND[BIRD] = save.bird;
+ OBJTXT[OYSTER] = save.bivalve;
+ game.zzword=RNDVOC(3,game.zzword);
}
}
- memcpy(&game, &save.game, sizeof(struct game_t));
- OBJSND[BIRD] = save.bird;
- OBJTXT[OYSTER] = save.bivalve;
- game.zzword=RNDVOC(3,game.zzword);
- return(2000);
+ return GO_TOP;
}
}
}
}