Converted divide operators '/' into divide and truncate where needed

Fixed xrange problems with python3

pgu/ani.py

@@ -9,6 +9,12 @@
 import math
 import pygame
 
+# Quick fix for python3
+try:
+    xrange
+except:
+    xrange = range
+
 def _ani_load(tv,name,parts,frames,shape):
     l = len(frames)
     n = parts.pop()

pgu/fonts.py

@@ -9,6 +9,12 @@
 import pygame
 from pygame.locals import *
 
+# Quick fix for python3
+try:
+    xrange
+except:
+    xrange = range
+
 class TileFont:
     """Creates an instance of the TileFont class.  Interface compatible 
     with pygame.Font

pgu/hexvid.py

@@ -63,15 +63,15 @@ def paint(self,screen):
 
         #dx += tile_w/2
 
-        for i2 in xrange(-bot,self.view.h/tile_h2+bot*3): #NOTE: 3 seems a bit much, but it works.
+        for i2 in xrange(-bot,self.view.h//tile_h2+bot*3): #NOTE: 3 seems a bit much, but it works.
             tx,ty = ox + i2/2 + i2%2,oy + i2/2
             x,y = (i2%2)*tile_wi2 + dx,i2*tile_h2 + dy
 
             #to adjust for the -1 in i1
             x,tx,ty = x-tile_wi,tx-1,ty+1
 
             x -= tile_w/2
-            for i1 in xrange(-1,self.view.w/tile_wi+1):
+            for i1 in xrange(-1,self.view.w//tile_wi+1):
                 if ty >= 0 and ty < h and tx >= 0 and tx < w:
                     if blayer != None:
                         n = blayer[ty][tx]

pgu/isovid.py

@@ -13,6 +13,12 @@
 from pgu.vid import *
 import pygame
 
+# Quick fix for python3
+try:
+    xrange
+except:
+    xrange = range
+
 class Isovid(Vid):
     """Create an iso vid engine.  See [[vid]]"""
     def update(self,screen):
@@ -65,13 +71,13 @@ def paint(self,screen):
         sx,sy = self.iso_to_view((ox*iso_w,oy*iso_h))
         dx,dy = sx - self.view.x,sy - self.view.y
 
-        for i2 in xrange(-bot,self.view.h/base_h2+bot):
+        for i2 in xrange(-bot,self.view.h//base_h2+bot):
             tx,ty = ox + i2/2 + i2%2,oy + i2/2
             x,y = (i2%2)*base_w2 + dx,i2*base_h2 + dy
 
             #to adjust for the -1 in i1
             x,tx,ty = x-base_w,tx-1,ty+1
-            for i1 in xrange(-1,self.view.w/base_w+2): #NOTE: not sure why +2
+            for i1 in xrange(-1,self.view.w//base_w+2): #NOTE: not sure why +2
                 if ty >= 0 and ty < h and tx >= 0 and tx < w:
                     z = zlayer[ty][tx]*iso_z
                     if blayer != None:

pgu/tilevid.py

@@ -3,6 +3,12 @@
 from pgu.vid import *
 import pygame
 
+# Quick fix for python3
+try:
+    xrange
+except:
+    xrange = range
+
 class Tilevid(Vid):
     """Based on [[vid]] -- see for reference."""
     def paint(self,s):
@@ -27,30 +33,30 @@ def paint(self,s):
         if (oy+sh)%th: my += 1
 
         if blayer != None:
-            for y in xrange(oy/th,my):
+            for y in xrange(oy//th,my):
                 if y >=0 and y < h:
                     trow = tlayer[y]
                     brow = blayer[y]
                     arow = alayer[y]
                     xx= - (self.view.x%tw)
                     mx = (ox+sw)/tw
                     #if (ox+sh)%tw: mx += 1
-                    for x in xrange(ox/tw,mx+1):
+                    for x in xrange(ox//tw,mx+1):
                         if x >=0and x<w:
                             blit(tiles[brow[x]].image,(xx,yy))
                             blit(tiles[trow[x]].image,(xx,yy))
                             arow[x]=0
                         xx += tw
                 yy+=th
         else:
-            for y in xrange(oy/th,my):
+            for y in xrange(oy//th,my):
                 if y >=0 and y<h:
                     trow = tlayer[y]
                     arow = alayer[y]
                     xx= - (self.view.x%tw)
                     mx = (ox+sw)/tw
                     #if (ox+sh)%tw: mx += 1
-                    for x in xrange(ox/tw,mx+1):
+                    for x in xrange(ox//tw,mx+1):
                         if x >=0 and x<w:
                             blit(tiles[trow[x]].image,(xx,yy))
                             arow[x]=0

pgu/vid.py

@@ -23,6 +23,12 @@
 from pygame.locals import *
 import math
 
+# Quick fix for python3
+try:
+    xrange
+except:
+    xrange = range
+
 class Sprite:
     """The object used for Sprites.
 

scripts/leveledit

@@ -178,7 +178,7 @@ class _app(gui.Container):
 
 
         tmp = self.level.tiles
-        self.level.tiles = [None for i in xrange(0,256)]
+        self.level.tiles = [None for i in range(0,256)]
         self.level.tga_load_tiles(self.codes,(self.tile_w,self.tile_h))
         self.level.codes = self.level.tiles
         self.level.tiles = tmp
@@ -454,8 +454,8 @@ class vdraw(gui.Widget):
         s = pygame.Surface((self.rect.w,self.rect.h))
         clrs = [(148,148,148),(108,108,108)]
         inc = 7
-        for y in range(0,self.rect.w/inc):
-            for x in range(0,self.rect.h/inc):
+        for y in range(0,self.rect.w//inc):
+            for x in range(0,self.rect.h//inc):
                 s.fill(clrs[(x+y)%2],(x*inc,y*inc,inc,inc))
         self.bg = s
 
@@ -840,8 +840,8 @@ def cmd_delete(value):
 def cmd_tswitch(value):
     blayer = app.level.blayer
     tlayer = app.level.tlayer
-    for ty in xrange(0,app.level.size[1]):
-        for tx in xrange(0,app.level.size[0]):
+    for ty in range(0,app.level.size[1]):
+        for tx in range(0,app.level.size[0]):
             tmp = blayer[ty][tx]
             blayer[ty][tx] = tlayer[ty][tx]
             tlayer[ty][tx] = tmp

scripts/levelfancy

@@ -83,8 +83,8 @@ def get3(l,tx,ty):
 
 def diff(a,b):
     r = 0
-    for y in xrange(0,5):
-        for x in xrange(0,5):
+    for y in range(0,5):
+        for x in range(0,5):
             va,vb = a[y][x],b[y][x]
             if va == vb: r += scoring[y][x]
             else: r -= scoring[y][x]
@@ -115,8 +115,8 @@ width,height = m_level.size
 lookup = {}
 used = []
 rmap = {}
-for y in xrange(0,height):
-    for x in xrange(0,width):
+for y in range(0,height):
+    for x in range(0,width):
         v = get(at,x,y)
         if v not in used: used.append(v)
 
@@ -138,17 +138,17 @@ for y in xrange(0,height):
 
 
 width,height = i_level.size
-for y in xrange(0,height):
+for y in range(0,height):
     print y
-    for x in xrange(0,width):
+    for x in range(0,width):
         v = get(it,x,y)
         if v in used:
-            idata = [[get3(it,tx,ty) for tx in xrange(x-2,x+3)] for ty in xrange(y-2,y+3)]
+            idata = [[get3(it,tx,ty) for tx in range(x-2,x+3)] for ty in range(y-2,y+3)]
             k = (get3(it,x,y),get3(it,x,y-1),get3(it,x+1,y),get3(it,x,y+1),get3(it,x-1,y))
             if k in lookup:
                 v,score = 0,-100000
                 for xx,yy in lookup[k]:
-                    adata = [[get(at,tx,ty) for tx in xrange(xx-2,xx+3)] for ty in xrange(yy-2,yy+3)]
+                    adata = [[get(at,tx,ty) for tx in range(xx-2,xx+3)] for ty in range(yy-2,yy+3)]
                     _v = get(bt,xx,yy)
                     _score = diff(idata,adata)
                     if _score > score: v,score = _v,_score