changeset 68:5c367b82fdf0

Merge
author Michael Rochseter <m.rochester93@googlemail.com>
date Sun, 08 Jul 2012 11:23:01 +0200
parents a30eaedf058a (current diff) d7d2c570f4c8 (diff)
children 3f1b3699faf2
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/zrpn/main.py	Sun Jul 08 11:22:05 2012 +0200
+++ b/zrpn/main.py	Sun Jul 08 11:23:01 2012 +0200
@@ -44,10 +44,12 @@
         Game(screen).run()
 
     def multi(self):
-        client.Client('localhost', 10000).run()
-        
+        ip = menu["ip"].text
+        client.Client(ip, 10000).run()
 
 menu = MainMenu(menu=("m:Zombies Robots Pirates Ninjas", ("f:single", "Single Player"),
+                      ("w:input_box", "name=ip", "text=localhost",
+                       "label=Enter IP for multiplayer server"),
                       ("f:multi", "Multiplayer"), ("f:exit", "Quit")))
 
 def main():