From 7b53da553fdc1389a159703bfade87083155f15f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 2 Feb 2005 21:00:59 +0000
Subject: Turned MAP struct into Map class.
---
src/graphic/graphic.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'src/graphic')
diff --git a/src/graphic/graphic.cpp b/src/graphic/graphic.cpp
index 3058ce56..591c7443 100644
--- a/src/graphic/graphic.cpp
+++ b/src/graphic/graphic.cpp
@@ -331,14 +331,14 @@ void Engine::draw()
// Draw tiles below nodes
for (int j = 0; j < 20; j++) {
for (int i = 0; i < 26; i++) {
- unsigned short tile0 = get_tile(i + camera_x, j + camera_y, 0);
- unsigned short tile1 = get_tile(i + camera_x, j + camera_y, 1);
+ int tile0 = tiledMap.getTile(i + camera_x, j + camera_y, 0);
+ int tile1 = tiledMap.getTile(i + camera_x, j + camera_y, 1);
- if (tile0 < tileset->spriteset.size()) {
+ if (tile0 < (int)tileset->spriteset.size()) {
tileset->spriteset[tile0]->draw(screen,
i * 32 - offset_x, j * 32 - offset_y);
}
- if (tile1 > 0 && tile1 < tileset->spriteset.size()) {
+ if (tile1 > 0 && tile1 < (int)tileset->spriteset.size()) {
tileset->spriteset[tile1]->draw(screen,
i * 32 - offset_x, j * 32 - offset_y);
}
@@ -461,9 +461,9 @@ void Engine::draw()
// Draw tiles above nodes
for (int j = 0; j < 20; j++) {
for (int i = 0; i < 26; i++) {
- unsigned short tile = get_tile(i + camera_x, j + camera_y, 2);
+ int tile = tiledMap.getTile(i + camera_x, j + camera_y, 2);
- if (tile > 0 && tile < tileset->spriteset.size()) {
+ if (tile > 0 && tile < (int)tileset->spriteset.size()) {
tileset->spriteset[tile]->draw(
screen, i * 32 - offset_x, j * 32 - offset_y);
}
--
cgit v1.2.3-70-g09d2