[pypy-svn] r29529 - pypy/dist/pypy/translator/js/demo/jsdemo
ericvrp at codespeak.net
ericvrp at codespeak.net
Fri Jun 30 11:40:00 CEST 2006
Author: ericvrp
Date: Fri Jun 30 11:39:58 2006
New Revision: 29529
Modified:
pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
pypy/dist/pypy/translator/js/demo/jsdemo/servermessage.py
Log:
missed these files from the previous checkin
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/bnb.py Fri Jun 30 11:39:58 2006
@@ -222,9 +222,10 @@
#force new session id to restart a game!
session['_id'] = md5.md5(str(random.random())).hexdigest()
sessionid = session['_id']
- self._serverMessage[sessionid] = ServerMessage('static/images/')
+ sm = ServerMessage('static/images/')
+ self._serverMessage[sessionid] = sm
self._spriteManagers[sessionid] = SpriteManager()
- return dict(messages=[])
+ return dict()
@turbogears.expose(format="json")
def get_message(self):
@@ -243,7 +244,7 @@
#log('RECEIVED HEADER LINE: %s' % header_line)
#log('RECEIVED DATA CONTAINS %d BYTES' % len(data))
- messages = []
+ messages = [ {'type':'count', 'n':sm.count()} ]
while data:
values, data = decodemessage(data)
if not values:
Modified: pypy/dist/pypy/translator/js/demo/jsdemo/servermessage.py
==============================================================================
--- pypy/dist/pypy/translator/js/demo/jsdemo/servermessage.py (original)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/servermessage.py Fri Jun 30 11:39:58 2006
@@ -28,6 +28,7 @@
PMSG_DEF_ICON = "def_icon"
PMSG_PLAYER_ICON = "player_icon"
PMSG_PLAYER_JOIN = "player_join"
+PMSG_PLAYER_KILL = "player_kill"
PMSG_DEF_KEY = "def_key"
PMSG_INLINE_FRAME = "inline_frame"
@@ -53,7 +54,11 @@
self.gfx_url = self.base_gfx_url
self.decompressobj = decompressobj().decompress
self.last_active = time()
+ self._count = 0
+ def count(self):
+ self._count += 1
+ return self._count
def dispatch(self, *values):
#log('RECEIVED:%s(%d)' % (values[0], len(values[1:])))
@@ -210,6 +215,10 @@
log('player_join player_id=%d, client_is_self=%d' % (player_id, client_is_self))
return dict(type=PMSG_PLAYER_JOIN, player_id=player_id, client_is_self=client_is_self)
+ def player_kill(self, player_id):
+ log('player_kill player_id=%d' % player_id)
+ return dict(type=PMSG_PLAYER_KILL, player_id=player_id)
+
def def_key(self, keyname, num, *icon_codes):
#log('def_key keyname=%s, num=%d, icon_codes=%s' % (keyname, num, str(icon_codes)))
return dict(type=PMSG_DEF_KEY, keyname=keyname, num=num, icon_codes=icon_codes)
@@ -261,6 +270,7 @@
MSG_DEF_ICON : def_icon,
MSG_PLAYER_ICON : player_icon,
MSG_PLAYER_JOIN : player_join,
+ MSG_PLAYER_KILL : player_kill,
MSG_DEF_KEY : def_key,
MSG_MD5_FILE : md5_file,
MSG_INLINE_FRAME : inline_frame,
More information about the Pypy-commit
mailing list