X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=a558f7eb21100751c726778d0ae2acd1bcfc5659;hp=b2a36352ab3d548394c407585d1908faff76bda4;hb=fb86d64b20f05e5a2920ba76fb908486c8a67ba0;hpb=11043b724623c33d304ce0ed5dd1d6ffa48ddcc4 diff --git a/main.c b/main.c index b2a3635..a558f7e 100644 --- a/main.c +++ b/main.c @@ -898,7 +898,7 @@ static void lampcheck(void) * lamp give out. When it gets close, we come here to warn him. * First following arm checks if the lamp and fresh batteries are * here, in which case we replace the batteries and continue. - * Second is for other cases of lamp dying. Eve after it goes + * Second is for other cases of lamp dying. Even after it goes * out, he can explore outside for a while if desired. */ if (game.limit <= WARNTIME) { if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) { @@ -1124,17 +1124,17 @@ Lclosecheck: if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { command.id1 = command.id2; command.type1 = command.type2; - strncpy(command.raw1, command.raw2, LINESIZE + 1); + strncpy(command.raw1, command.raw2, LINESIZE - 1); command.id2 = WORD_EMPTY; command.type2 = NO_WORD_TYPE; - strncpy(command.raw2, "", LINESIZE + 1); + strncpy(command.raw2, "", LINESIZE - 1); } else { if (!((command.id1 != WATER && command.id1 != OIL) || (command.id2 != PLANT && command.id2 != DOOR))) { if (AT(command.id2)) { command.id2 = POUR; command.type2 = ACTION; - strncpy(command.raw2, "POUR", LINESIZE + 1); + strncpy(command.raw2, "POUR", LINESIZE - 1); command.wd2 = token_to_packed("POUR"); } } @@ -1142,7 +1142,7 @@ Lclosecheck: { command.id1 = CARRY; command.type1 = ACTION; - strncpy(command.raw2, "CATCH", LINESIZE + 1); + strncpy(command.raw2, "CATCH", LINESIZE - 1); command.wd1 = token_to_packed("CATCH"); } }