From: Holger Schemel <info@artsoft.org>
Date: Tue, 1 Mar 2016 23:56:08 +0000 (+0100)
Subject: Merge branch 'master' into global-anims
X-Git-Tag: 4.0.0.0-rc1~62
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=30f5fd7b8f2235820dcbe638a18319d802317530;hp=f78f30b84a0345ea31b30c5bd95e338c9d9ebd4b

Merge branch 'master' into global-anims
---

diff --git a/src/game.c b/src/game.c
index 7f98027c..cc6bcdfc 100644
--- a/src/game.c
+++ b/src/game.c
@@ -11097,8 +11097,11 @@ void GameActions()
     SendToServer_MovePlayer(summarized_player_action);
 #endif
 
+  // summarize all actions at local players mapped input device position
+  // (this allows using different input devices in single player mode)
   if (!options.network && !game.team_mode)
-    local_player->effective_action = summarized_player_action;
+    stored_player[map_player_action[local_player->index_nr]].effective_action =
+      summarized_player_action;
 
   if (tape.recording &&
       setup.team_mode &&
@@ -11134,6 +11137,7 @@ void GameActions()
 #if USE_NEW_PLAYER_ASSIGNMENTS
   // !!! also map player actions in single player mode !!!
   // if (game.team_mode)
+  if (1)
   {
     byte mapped_action[MAX_PLAYERS];