Permalink
Browse files

upgrade enet to 1.3.3 and more important pyenet to current trunk (r23…

…) for all platforms

(I'm not entirely sure that darwin works but it should be an universal binary)
  • Loading branch information...
manuelm committed Sep 29, 2011
1 parent fdd5697 commit e011d0fed373f521aa44e5c6f4de61cd85759bce
@@ -23,7 +23,7 @@
import platform
import os
def find_enet_module():
def find_enet_module(client = True):
# Try to find installed version first
try:
import enet
@@ -52,7 +52,11 @@ def find_enet_module():
arch_module = __import__(dir, globals(), locals(), fromlist=["enet"])
return arch_module.enet
except ImportError:
pass
# ternary operator doesn't work
if client:
pass
else:
raise
# we can't raise an ImportError here, because the game should work even when
# there's no enet.
@@ -84,4 +88,4 @@ class CommandError(ClientException):
pass
class FatalError(ClientException):
pass
pass
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -26,7 +26,7 @@
from horizons import network
from horizons.network import packets, find_enet_module
enet = find_enet_module()
enet = find_enet_module(client = False)
MAX_PEERS = 4095
CONNECTION_TIMEOUT = 500
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit e011d0f

Please sign in to comment.