Merge branch 'master' of https://github.com/SuperTux/supertux

Author: tobbi

data/images/decal/retro/golden-herring.png

@@ -220,9 +220,12 @@ KeyboardManager::process_menu_key_event(const SDL_KeyboardEvent& event)
       break;
     default:
       if (m_keyboard_config.m_keymap.count(event.keysym.sym) == 0)
-      {
         return;
-      }
+
+      // Forbid events from players other than the first in menus
+      if (m_keyboard_config.m_keymap[event.keysym.sym].player != 0)
+        return;
+
       control = m_keyboard_config.m_keymap[event.keysym.sym].control;
       break;
   }

data/images/decal/retro/title_old.png

@@ -41,7 +41,7 @@ Trampoline::Trampoline(const ReaderMapping& mapping) :
 
   //Check if this trampoline is not portable
   if (mapping.get("portable", portable)) {
-    if (!portable) {
+    if (!portable && !mapping.get("sprite", m_sprite_name)) {
       //we need another sprite
       m_sprite_name = "images/objects/trampoline/trampoline_fix.sprite";
       m_default_sprite_name = m_sprite_name;