X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=fc4f9bea8fbcb77524915bea5c8b80e3f07e98dd;hb=refs%2Fmerge-requests%2F183%2Fhead;hp=0a5ce3d3bdd7e655ca70ece55792366924d60def;hpb=ab79fc78144cd1433c6e8276ab133067be28083e;p=open-adventure.git diff --git a/main.c b/main.c index 0a5ce3d..fc4f9be 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,6 @@ static void sig_handler(int signo) * MAIN PROGRAM * * Adventure (rev 2: 20 treasures) -Here's what we think. * * History: Original idea & 5-treasure version (adventures) by Willie Crowther * 15-treasure version (adventure) by Don Woods, April-June 1977 * 20-treasure version (rev 2) by Don Woods, August 1978 @@ -629,7 +628,7 @@ static bool playermove( int motion) BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE ++te_tmp; } while - (T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp])); + ((T_DESTINATION(travel[travel_entry]) == T_DESTINATION(travel[te_tmp])) && (T_CONDITION(travel[travel_entry]) == T_CONDITION(travel[te_tmp]))); travel_entry = te_tmp; } @@ -671,7 +670,7 @@ static bool playermove( int motion) BUG(CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION); // LCOV_EXCL_LINE ++te_tmp; } while - (T_HIGH(travel[travel_entry]) == T_HIGH(travel[te_tmp])); + ((T_DESTINATION(travel[travel_entry]) == T_DESTINATION(travel[te_tmp])) && (T_CONDITION(travel[travel_entry]) == T_CONDITION(travel[te_tmp]))); travel_entry = te_tmp; continue; /* goto L12 */ case 3: