diff --git a/sc2/ChangeLog b/sc2/ChangeLog index e04ca96e7..4854789e0 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.3: +- Fixed some more false key cancels, addressing 378 again - Michael - Added "gestalt mode" for acceleration cancels; fixes #381 - Michael - Fixed some "false key cancels" in the input system, addressing bugs #378 and #379 -Michael diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index f7c9f25ae..2061d1c1e 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -2049,7 +2049,7 @@ HailAlien (void) LastActivity |= CHECK_LOAD; /* prevent spurious input */ (*CommData.init_encounter_func) (); - DoInput ((PVOID)&ES, TRUE); + DoInput ((PVOID)&ES, FALSE); if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD))) (*CommData.uninit_encounter_func) (); diff --git a/sc2/src/sc2code/init.c b/sc2/src/sc2code/init.c index 453962ae0..a3fe5ca68 100644 --- a/sc2/src/sc2code/init.c +++ b/sc2/src/sc2code/init.c @@ -175,7 +175,7 @@ InitShips (void) } } - FlushInput (); + // FlushInput (); return (num_ships); } diff --git a/sc2/src/sc2code/planets/solarsys.c b/sc2/src/sc2code/planets/solarsys.c index ab83198a1..0eb75f371 100644 --- a/sc2/src/sc2code/planets/solarsys.c +++ b/sc2/src/sc2code/planets/solarsys.c @@ -1922,7 +1922,7 @@ ExploreSolarSys (void) SolarSysState.GenFunc = GenerateIP (CurStarDescPtr->Index); InitSolarSys (); - DoInput ((PVOID)&SolarSysState.MenuState, TRUE); + DoInput ((PVOID)&SolarSysState.MenuState, FALSE); UninitSolarSys (); pSolarSysState = 0; }