single click fire working, double click cruise control working, only …

…cancel with +/-
pharmaka · Apr 9, 2017 · 413c8a0 · 413c8a0
1 parent 3bb9dcb
commit 413c8a0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/bin/myevic.bin b/bin/myevic.bin
diff --git a/src/eh.c b/src/eh.c
@@ -565,8 +565,8 @@ __myevic__ void EventHandler()
 			gFlags.firing = 1;
 			FireDuration = 0;
 
-			AutoPuffTimer=2000;
-			Event = EVENT_AUTO_PUFF;
+			//AutoPuffTimer=2000;
+			//Event = EVENT_AUTO_PUFF;
 			//gFlags.autopuff=1;
 
 			if ( BattProbeCount == 1 ) BattProbeCount = 2;

diff --git a/src/events.c b/src/events.c
@@ -199,16 +199,26 @@ __myevic__ void GetUserInput()
 	}
 	else
 	{
+
+		if (gFlags.autopuff)
+			{
+				if ( LastInputs == 1 )
+					{
+						AutoPuffTimer = 0;
+						gFlags.autopuff = 0;
+						StopFire();
+					}
+			}
 		if ( gFlags.firing )
 		{
 			if ( LastInputs == 1 )
-				StopFire();
 			{
-				if (!gFlags.autopuff)
+				StopFire();
+				if (gFlags.autopuff)
 					{
 						AutoPuffTimer = 0;
 						gFlags.autopuff = 0;
-						//StopFire();
+						StopFire();
 					}
 			}
 			gFlags.user_idle = 1;
@@ -364,10 +374,13 @@ __myevic__ void GetUserInput()
 					break;
 
 				case 2:
-					AutoPuffTimer=2000;
+					AutoPuffTimer=6000;
  					Event = EVENT_AUTO_PUFF;
 					gFlags.autopuff=1;
-					break;
+					if ( Screen != 1 || !EditModeTimer || EditItemIndex != 4 )
+					{
+						Event = 1;	// fire
+					}
 				case 3:
 				case 4:
 					switch ( dfClick[FireClickCount-2] )