Merge branch 'master' of https://git.e-dt.xyz/e-dt/bodice

main.py

@@ -5,6 +5,9 @@ class SquareType(Enum):
     SEAT = 1
 
 
+height=7
+width=33
+
 class GridSquare:
     def __init__(self, typ, occupant):
         self.typ = typ
@@ -17,8 +20,6 @@ class GridSquare:
 def makeGrid(height, width):
     return [[GridSquare(SquareType.AISLE, None) for x in range(0,width)] for y in range(0,height)]
 
-grid=makeGrid(7,33)
-
 class Passenger:
     #dest and curr are both 2-tuples
     def __init__(self, dest, curr):
@@ -46,6 +47,8 @@ def nextSquare(passenger, grid):
 def GenPassList():
     return []
 
+grid=makeGrid()
+
 passengers = GenPassList()
 for index, i in enumerate(passengers):
     grid[i.curr[0]][i.curr[1]] = index