X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=944a14d45157d06e7a69911dcc2458f001aed2d0;hb=2ae280befb7674440ae495f3b9a427edc51e98ab;hp=d8d5f54653fae2a770de51ca1696de1bc0d3ce64;hpb=c9cc36c6810f42cb3965488c0702ae53b8e8dfe3;p=open-adventure.git diff --git a/main.c b/main.c index d8d5f54..944a14d 100644 --- a/main.c +++ b/main.c @@ -346,11 +346,15 @@ static bool dwarfmove(void) if(HERE(J)) K=1; } + /* Force chest placement before player finds last treasure */ if(game.tally == 1 && K == 0 && game.place[CHEST] == 0 && HERE(LAMP) && game.prop[LAMP] == 1) { RSPEAK(186); MOVE(CHEST,game.chloc); MOVE(MESSAG,game.chloc2); - goto L6024; + game.dloc[PIRATE]=game.chloc; + game.odloc[PIRATE]=game.chloc; + game.dseen[PIRATE]=false; + continue; } if(game.odloc[PIRATE] != game.dloc[PIRATE] && PCT(20)) RSPEAK(127); @@ -372,7 +376,6 @@ static bool dwarfmove(void) DROP(J,game.chloc); } } - L6024: game.dloc[PIRATE]=game.chloc; game.odloc[PIRATE]=game.chloc; game.dseen[PIRATE]=false; @@ -412,6 +415,39 @@ static bool dwarfmove(void) return false; } +static void croak(FILE *cmdin) +/* Okay, he's dead. Let's get on with it. */ +{ + if(game.closng) { + /* He died during closing time. No resurrection. Tally up a + * death and exit. */ + RSPEAK(131); + ++game.numdie; + score(0); + } else { + ++game.numdie; + if(!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54)) + score(0); + if(game.numdie == MAXDIE) + score(0); + game.place[WATER]=0; + game.place[OIL]=0; + if(TOTING(LAMP)) + game.prop[LAMP]=0; + for (J=1; J<=NOBJECTS; J++) { + I=NOBJECTS + 1 - J; + if(TOTING(I)) { + K=game.oldlc2; + if(I == LAMP) + K=1; + DROP(I,K); + } + } + game.loc=3; + game.oldloc=game.loc; + } +} + static bool do_command(FILE *cmdin) { long LL, KQ, VERB, KK, K2, V1, V2; long obj, i; @@ -441,13 +477,14 @@ static bool do_command(FILE *cmdin) { game.loc=game.newloc; if (!dwarfmove()) - goto L99; + croak(cmdin); /* Describe the current location and (maybe) get next command. */ /* Print text for current loc. */ -L2000: if(game.loc == 0) goto L99; +L2000: if(game.loc == 0) + croak(cmdin); KK=STEXT[game.loc]; if(MOD(game.abbrev[game.loc],game.abbnum) == 0 || KK == 0)KK=LTEXT[game.loc]; if(FORCED(game.loc) || !DARK(0)) goto L2001; @@ -651,11 +688,40 @@ L8000: SETPRM(1,WD1,WD1X); L8: KK=KEY[game.loc]; game.newloc=game.loc; - if(KK == 0)BUG(26); - if(K == NUL) return true; - if(K == BACK) goto L20; - if(K == LOOK) goto L30; - if(K == CAVE) goto L40; + if(KK == 0) + BUG(26); + if(K == NUL) + return true; + if(K == BACK) { + /* Handle "go back". Look for verb which goes from game.loc to + * game.oldloc, or to game.oldlc2 If game.oldloc has forced-motion. + * K2 saves entry -> forced loc -> previous loc. */ + K=game.oldloc; + if(FORCED(K))K=game.oldlc2; + game.oldlc2=game.oldloc; + game.oldloc=game.loc; + K2=0; + if(K == game.loc)K2=91; + if(CNDBIT(game.loc,4))K2=274; + if(K2 == 0) goto L21; + RSPEAK(K2); + return true; + } + if(K == LOOK) { + /* Look. Can't give more detail. Pretend it wasn't dark + * (though it may "now" be dark) so he won't fall into a + * pit while staring into the gloom. */ + if(game.detail < 3)RSPEAK(15); + game.detail=game.detail+1; + game.wzdark=false; + game.abbrev[game.loc]=0; + return true; + } + if(K == CAVE) { + /* Cave. Different messages depending on whether above ground. */ + RSPEAK((OUTSID(game.loc) && game.loc != 8) ? 57 : 58); + return true; + } game.oldlc2=game.oldloc; game.oldloc=game.loc; @@ -663,7 +729,7 @@ L9: LL=labs(TRAVEL[KK]); if(MOD(LL,1000) == 1 || MOD(LL,1000) == K) goto L10; if(TRAVEL[KK] < 0) goto L50; KK=KK+1; - goto L9; + goto L9; L10: LL=LL/1000; L11: game.newloc=LL/1000; @@ -741,25 +807,11 @@ L30310: game.newloc=PLAC[TROLL]+FIXD[TROLL]-game.loc; game.fixed[BEAR]= -1; game.prop[BEAR]=3; game.oldlc2=game.newloc; - goto L99; + croak(cmdin); + goto L2000; /* End of specials. */ -/* Handle "go back". Look for verb which goes from game.loc to - * game.oldloc, or to game.oldlc2 If game.oldloc has forced-motion. - * K2 saves entry -> forced loc -> previous loc. */ - -L20: K=game.oldloc; - if(FORCED(K))K=game.oldlc2; - game.oldlc2=game.oldloc; - game.oldloc=game.loc; - K2=0; - if(K == game.loc)K2=91; - if(CNDBIT(game.loc,4))K2=274; - if(K2 == 0) goto L21; - RSPEAK(K2); - return true; - L21: LL=MOD((labs(TRAVEL[KK])/1000),1000); if(LL != K) { if(LL <= 300) { @@ -767,7 +819,8 @@ L21: LL=MOD((labs(TRAVEL[KK])/1000),1000); if(FORCED(LL) && MOD((labs(TRAVEL[J])/1000),1000) == K) K2=KK; } - if(TRAVEL[KK] < 0) goto L23; + if(TRAVEL[KK] < 0) + goto L23; KK=KK+1; goto L21; @@ -780,23 +833,8 @@ L23: KK=K2; K=MOD(labs(TRAVEL[KK]),1000); KK=KEY[game.loc]; - goto L9; + goto L9; -/* Look. Can't give more detail. Pretend it wasn't dark (though it may "now" - * be dark) so he won't fall into a pit while staring into the gloom. */ - -L30: if(game.detail < 3)RSPEAK(15); - game.detail=game.detail+1; - game.wzdark=false; - game.abbrev[game.loc]=0; - return true; - -/* Cave. Different messages depending on whether above ground. */ - -L40: K=58; - if(OUTSID(game.loc) && game.loc != 8)K=57; - RSPEAK(K); - return true; /* Non-applicable motion. Various messages depending on word given. */ @@ -832,38 +870,8 @@ L50: SPK=12; L90: RSPEAK(23); game.oldlc2=game.loc; - -/* Okay, he's dead. Let's get on with it. */ - -L99: if(game.closng) { - /* He died during closing time. No resurrection. Tally up a - * death and exit. */ - RSPEAK(131); - ++game.numdie; - score(0); - } else { - ++game.numdie; - if(!YES(cmdin,79+game.numdie*2,80+game.numdie*2,54)) - score(0); - if(game.numdie == MAXDIE) - score(0); - game.place[WATER]=0; - game.place[OIL]=0; - if(TOTING(LAMP)) - game.prop[LAMP]=0; - for (J=1; J<=NOBJECTS; J++) { - I=NOBJECTS + 1 - J; - if(TOTING(I)) { - K=game.oldlc2; - if(I == LAMP) - K=1; - DROP(I,K); - } - } - game.loc=3; - game.oldloc=game.loc; - goto L2000; - } + croak(cmdin); + goto L2000; /* Cave closing and scoring */