changeset 66:d7d2c570f4c8

Ooooh, more merges, I just love Merucurial.
author "Sam Bull <sam@sambull.org>"
date Sun, 08 Jul 2012 10:15:26 +0100
parents 783ad2376233 (current diff) 21049efe1631 (diff)
children 5c367b82fdf0 7d2d94dd8a6a
files zrpn/main.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/zrpn/main.py	Sun Jul 08 10:13:29 2012 +0100
+++ b/zrpn/main.py	Sun Jul 08 10:15:26 2012 +0100
@@ -9,6 +9,7 @@
 
 import board
 import display
+import client
 
 screen = display.Display()
 
@@ -44,7 +45,7 @@
 
     def multi(self):
         ip = menu["ip"].text
-        raise NotImplementedError("Add multiplayer")
+        client.Client(ip, 10000).run()
 
 menu = MainMenu(menu=("m:Zombies Robots Pirates Ninjas", ("f:single", "Single Player"),
                       ("w:input_box", "name=ip", "text=localhost",