rename TILESIZE

3 files changed, 15 insertions, 16 deletions

diff --git a/character.py b/character.py
index 7ac8aad..9129c1e 100644
--- a/character.py
+++ b/character.py
@@ -5,17 +5,16 @@ from tileset import Tileset
 class Character(object):
 	movement = [0, 0]
 
-	def __init__(self, start_pos, tilesize):
-		self.tilesize = tilesize
+	def __init__(self, start_pos):
 		self.render_x, self.render_y = start_pos
-		self.render_x *= tilesize
-		self.render_y *= tilesize
+		self.render_x *= Tileset.TILESIZE
+		self.render_y *= Tileset.TILESIZE
 
 	def frame(self, keys):
 		# are we done moving?
-		if self.render_x % self.tilesize == 0:
+		if self.render_x % Tileset.TILESIZE == 0:
 			self.movement[0] = 0
-		if self.render_y % self.tilesize == 0:
+		if self.render_y % Tileset.TILESIZE == 0:
 			self.movement[1] = 0
 
 		SPEED = 2
diff --git a/tileset.py b/tileset.py
index 95473e3..017f995 100644
--- a/tileset.py
+++ b/tileset.py
@@ -4,7 +4,7 @@ from xml.etree import ElementTree
 import pygame
 
 class Tileset(object):
-	tilesize = 16
+	TILESIZE = 16
 	RIGHT = 0
 	DOWN = 1
 	LEFT = 2
@@ -23,8 +23,8 @@ class Tileset(object):
 			self.DOWN: pygame.transform.rotate(image, 270),
 		}
 		self.tile_width, self.tile_height = image.get_size()
-		self.tile_width /= self.tilesize
-		self.tile_height /= self.tilesize
+		self.tile_width /= self.TILESIZE
+		self.tile_height /= self.TILESIZE
 
 	def _render(self, tile_x, tile_y, pos, direction=RIGHT):
 		tileset = self.tileset[direction]
@@ -36,9 +36,9 @@ class Tileset(object):
 			x, y = self.tile_width - tile_x - 1, self.tile_height - tile_y - 1
 		elif direction == self.DOWN:
 			x, y = self.tile_height -tile_y - 1, tile_x
-		x *= self.tilesize
-		y *= self.tilesize
-		self.screen.blit(tileset, pos, (x, y, self.tilesize, self.tilesize))
+		x *= self.TILESIZE
+		y *= self.TILESIZE
+		self.screen.blit(tileset, pos, (x, y, self.TILESIZE, self.TILESIZE))
 
 	def render_person(self, pos, direction):
 		self._render(0, 13, pos, direction)
@@ -73,7 +73,7 @@ class Tileset(object):
 	def render_level(self):
 		for i, tile in enumerate(self.level_array):
 			y, x = divmod(i, 50)
-			x *= self.tilesize
-			y *= self.tilesize
-			tile_y, tile_x = divmod(tile - 1, self.tilesize) # those 1-indexing fuckers
+			x *= self.TILESIZE
+			y *= self.TILESIZE
+			tile_y, tile_x = divmod(tile - 1, self.TILESIZE) # those 1-indexing fuckers
 			self._render(tile_x, tile_y, (x, y))
diff --git a/troll b/troll
index 7572296..7b9bb92 100755
--- a/troll
+++ b/troll
@@ -9,7 +9,7 @@ pygame.init()
 screen = pygame.display.set_mode((800, 800))
 tileset = Tileset(screen)
 units = tileset.load_level()
-character = Character(units[Tileset.PLAYER][0], tileset.tilesize)
+character = Character(units[Tileset.PLAYER][0])
 clock = pygame.time.Clock()
 
 black = (0, 0, 0)