X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=2b0d292b2d5132fa1d58f7fd4f13859ef248d426;hp=603b98a05ef23907cfcfcb2145e761d05a451118;hb=812d0194bb5286a0688f4ff58943451890a07ed8;hpb=2ae60b85d1124c0ce1438b3ca9079bcb0c0681ec diff --git a/main.c b/main.c index 603b98a..2b0d292 100644 --- a/main.c +++ b/main.c @@ -1059,16 +1059,22 @@ Lclearobj: return false; #ifdef GDEBUG - printf("Preserve: type1 = %u, id1 = %ld, id2 = %ld\n", - preserve.type1, preserve.id1, preserve.id2); - printf("Command: type2 = %u, id1 = %ld, id2 = %ld\n", - preserve.type2, command.id1, command.id2); + printf("Preserve: type1 = %u, id1 = %ld, type2 = %u id2 = %ld\n", + preserve.type1, preserve.id1, preserve.type2, preserve.id2); + printf("Command: type1 = %u, id1 = %ld, type2 = %u id2 = %ld\n", + command.type1, command.id1, command.type2, command.id2); #endif - /* Handle of objectless action followed by actionless object */ + /* Handling of objectless action followed by actionless object */ if (preserve.type1 == ACTION && preserve.type2 == NO_WORD_TYPE && command.id2 == 0) command.verb = preserve.verb; +#ifdef BROKEN + /* Handling of actionless object followed by objectless action */ + if (preserve.type1 == OBJECT && preserve.type2 == NO_WORD_TYPE && command.id2 == 0) + command.obj = preserve.obj; +#endif + ++game.turns; if (closecheck()) {