From: Holger Schemel Date: Tue, 1 Mar 2016 23:53:41 +0000 (+0100) Subject: fixed bug where player actions were incorrectly mapped in single player mode (also... X-Git-Tag: 4.0.0.0-rc1~62^2 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=4c97b1045b53135f75e9324747abb5e9286b813d;p=rocksndiamonds.git fixed bug where player actions were incorrectly mapped in single player mode (also see commit '8770e2b8105f8bb38e5ab4f385e044de16436dea') --- 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];