advance on click or assign during pause

SimonN · Jun 2, 2016 · 64c9b94 · 64c9b94
1 parent a61fcfd
commit 64c9b94
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/doc/history.txt b/doc/history.txt
@@ -4,6 +4,14 @@
 \_____________________________________________________________________________/
 
 
+
+2016-06-02
+
+    During pause, physics advance by 1 frame when you click into the air
+    or assign a skill.
+
+
+
 2016-01-31
 
     Replay verifier can convert and overwrite.

diff --git a/src/gameplay/gamepl_a.cpp b/src/gameplay/gamepl_a.cpp
@@ -254,10 +254,6 @@ if (priority > 1 && priority < 99999) {
                     skill_visible->set_number(skill_visible->get_number() - 1);
                     Sound::play_loud(snd);
                 }
-
-                // assign
-                pan.pause.set_off();
-
                 Replay::Data data = new_replay_data();
                 data.action       = only_dir_l ? Replay::ASSIGN_LEFT
                                   : only_dir_r ? Replay::ASSIGN_RIGHT
@@ -266,12 +262,19 @@ if (priority > 1 && priority < 99999) {
                 data.what         = lem_id;
                 replay.add(data);
                 Network::send_replay_data(data);
+
+                // Assign shouldn't disable pause. Nonetheless, we advance
+                // one frame, to provide feedback. See Gameplay.calc_self()
+                // and think about why we can safely do it here
+                if (pan.pause.get_on())
+                    update();
             }
             else {
                 Sound::play_loud(Sound::PANEL_EMPTY);
             }
         }
-
+        else if (hardware.get_ml() && pan.pause.get_on())
+            update();
     }
     // end of: mouse in the playing field, no aiming
 

diff --git a/src/other/globals.cpp b/src/other/globals.cpp
@@ -15,7 +15,7 @@
 
 Globals* gloB(0);
 
-const unsigned long Globals::version       (CONCAT(2016, 01, 31, 00));
+const unsigned long Globals::version       (CONCAT(2016, 06, 02, 00));
 const unsigned long Globals::version_min   (CONCAT(2015, 08, 09, 00));
 const bool          Globals::version_stable(true);