Merge remote-tracking branch 'origin/master'

susw12 · Mar 14, 2017 · 87ad82c · 87ad82c
2 parents 1e0f71c + 794c33d
commit 87ad82c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/game.html b/game.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 
-<title>Chimp</title>
+<title>Carrom</title>
 <meta name="pygwt:module" content="chimp">
 </head>
 <body style="background-color:black">

diff --git a/game.py b/game.py
@@ -1,11 +1,13 @@
 
 from __future__ import division
 from __future__ import absolute_import
-import pygame
+import pyjsdl as pygame
 from math import pi, cos, sin, sqrt
 from random import randint, random
 from io import open
 
+pyjsdl.display.setup(run, ["boarg.jpg"])
+
 
 class Vector2(object):
 
@@ -245,9 +247,9 @@ def draw(self):
 
                 pygame.display.update()
 
-			
-client = Client()
-client.run()
+def run():
+    client = Client()
+    client.run()