Lots and lots of stuff. Got robots working.

Author: simhacker

BUGS.txt

@@ -115,3 +115,31 @@ http://blogs.adobe.com/air/2009/05/performance_tips_for_adobe_air.html
 
 http://arno.org/arnotify/2009/05/writing-well-behaved-efficient-air-applications/
 
+Bug in cherrypy socket flushing on mac.
+http://www.cherrypy.org/ticket/598
+
+/opt/local/lib/python2.5/site-packages/CherryPy-2.3.0-py2.5.egg/cherrypy/_cpwsgiserver.py
+    def tick(self):
+        try:
+            s, addr = self.socket.accept()
+            if not self.ready:
+                return
+            #if hasattr(s, 'settimeout'):
+            #    s.settimeout(self.timeout)
+            s.settimeout(None)
+            request = self.RequestHandlerClass(s, addr, self)
+            self.requests.put(request)
+
+/opt/local/lib/python2.5/site-packages/CherryPy-2.3.0-py2.5.egg/cherrypy/_cpwsgiserver3.py
+    def tick(self):
+        """Accept a new connection and put it on the Queue."""
+        try:
+            s, addr = self.socket.accept()
+            if not self.ready:
+                return
+            #if hasattr(s, 'settimeout'):
+            #    s.settimeout(self.timeout)
+            s.settimeout(None)
+            conn = self.ConnectionClass(s, addr, self)
+            self.requests.put(conn)
+

MicropolisCore/src/images/simEngine/dataColorMap.png renamed to MicropolisCore/src/images/micropolisEngine/dataColorMap.png

@@ -117,7 +117,7 @@ build_cellEngine:
 # ----------------------------------------------------------------------
 # build/install micropolisEngine
 
-MICROPOLISENGINEDEST = pyMicropolis/simEngine
+MICROPOLISENGINEDEST = pyMicropolis/micropolisEngine
 
 build_micropolisEngine:
 	$(MAKE) -C MicropolisEngine build_python

MicropolisCore/src/images/simEngine/icairp.png renamed to MicropolisCore/src/images/micropolisEngine/icairp.png

@@ -5,8 +5,8 @@
 """
 
 
-import pyMicropolis.simEngine
-from pyMicropolis.simEngine import micropolisengine, micropolisgtkengine, micropoliswindow, micropolisrobot
+import pyMicropolis.micropolisEngine
+from pyMicropolis.micropolisEngine import micropolisengine, micropolisgtkengine, micropoliswindow, micropolisrobot
 import gtk
 import random
 import math
@@ -23,15 +23,15 @@ def run():
     if True:
         for i in range(0, 4):
             engine.addRobot(
-                micropolisrobot.MicropolisRobot_PacMan(
+                micropolisrobot.MicropolisRobot_PacBot(
                     x=(8 * 16) + 3 + (16 * 2 * i),
                     y=(7 * 16) + 3,
                     direction=0))
 
     if False:
         for i in range(0, 20):
             engine.addRobot(
-                micropolisrobot.MicropolisRobot_PacMan(
+                micropolisrobot.MicropolisRobot_PacBot(
                     x=random.randint(0, (micropolisengine.WORLD_W * 16) - 1),
                     y=random.randint(0, (micropolisengine.WORLD_H * 16) - 1),
                     direction = random.randint(0, 3) * math.pi / 2))

MicropolisCore/src/images/simEngine/icairphi.png renamed to MicropolisCore/src/images/micropolisEngine/icairphi.png

@@ -69,7 +69,7 @@ clean:
 	rm -rf *~ *.pyc *.pyd *.so */?*~ */*.pyc */*.pyd */*.so \
 		tileEngine/tileengine.py \
 		cellEngine/cellengine.py \
-		simEngine/micropolisengine.py
+		micropolisEngine/micropolisengine.py
 
 
 ########################################################################

MicropolisCore/src/images/simEngine/icchlk.png renamed to MicropolisCore/src/images/micropolisEngine/icchlk.png

@@ -143,7 +143,7 @@
     images = []
     spriteData['images'] = images
     for i in range(0, spriteData['frames']):
-        fileName = 'images/simEngine/obj%d-%d.png' % (
+        fileName = 'images/micropolisEngine/obj%d-%d.png' % (
             spriteData['id'],
             i,
         )

MicropolisCore/src/images/simEngine/icchlkhi.png renamed to MicropolisCore/src/images/micropolisEngine/icchlkhi.png

@@ -683,19 +683,19 @@ def __init__(
 
         self.dataColorMap = \
             cairo.ImageSurface.create_from_png(
-                'images/simEngine/dataColorMap.png')
+                'images/micropolisEngine/dataColorMap.png')
 
         self.rateColorMap = \
             cairo.ImageSurface.create_from_png(
-                'images/simEngine/rateColorMap.png')
+                'images/micropolisEngine/rateColorMap.png')
 
         self.powerGridColorMap = \
             cairo.ImageSurface.create_from_png(
-                'images/simEngine/powerGridColorMap.png')
+                'images/micropolisEngine/powerGridColorMap.png')
 
         self.terrainColorMap = \
             cairo.ImageSurface.create_from_png(
-                'images/simEngine/terrainColorMap.png')
+                'images/micropolisEngine/terrainColorMap.png')
 
         self.expressInterest(
             self,
@@ -1644,6 +1644,11 @@ def removeRobot(self, robot):
             robots.remove(robot)
 
 
+    def clearRobots(self):
+        for robot in list(self.robots):
+            self.removeRobot(robot)
+
+
     def simRobots(self):
         #print "SIMROBOTS"
         for robot in self.robots: