diff --git a/GameMap.py b/GameMap.py index 0d02c41..b325ab1 100644 --- a/GameMap.py +++ b/GameMap.py @@ -3,10 +3,10 @@ class GameMap: def __init__(self, max_size_x = float('inf'), max_size_y = float('inf')): self.max_size_x = max_size_x self.max_size_y = max_size_y - data = {} + self.data = {} def __str__(self): - return data + return str(self.data) def get_max_size_x(self): @@ -18,12 +18,15 @@ class GameMap: def add_player_mark(self, x, y, player): - if x <= max_size_x or y <= max_size_y: + if x <= self.max_size_x and y <= self.max_size_y: self.data[(x,y)] = player + player.record_mark(x, y) else: - raise IndexError("Mark added beyond preset max values (max_x - " + self.max_size_x + ", max_y - " + self.max_size_y + ".") + errorMessage = "The mark" + str((x,y)) + " is beyond preset max values, max_x - " + str(self.max_size_x) + ", max_y - " + str(self.max_size_y) + raise IndexError(errorMessage) def clear_map(self): self.data = {} + \ No newline at end of file