Changeset 7690 for code/trunk

Timestamp:

Dec 1, 2010, 3:21:11 PM (14 years ago)

Author:

dafrick

Message:

Adjusting some small thing that got forgotten while merging.

Location:

code/trunk/data/gui/scripts

Files:

• GUITools.lua (modified) (1 diff)
• MultiplayerMenu.lua (modified) (2 diffs)

code/trunk/data/gui/scripts/GUITools.lua

@@ -213 +213 @@
     
     --enter
-    if code == "28" then
+    if code == "28" and P.index >= 0 then
         local item = list[P.index+1]
         local child = item["button"] 

code/trunk/data/gui/scripts/MultiplayerMenu.lua

@@ -11 +11 @@
     local item = {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerJoinButton"),
-            ["function"]  = P.MultiplayerJoinButton2_clicked
+            ["function"]  = P.MultiplayerJoinButton_clicked
     }
     P.buttonList[1] = item
@@ -17 +17 @@
     local item = {
             ["button"] = winMgr:getWindow("orxonox/MultiplayerHostButton"),
-            ["function"]  = P.MultiplayerHostButton2_clicked
+            ["function"]  = P.MultiplayerHostButton_clicked
     }
     P.buttonList[2] = item