Browse Source

Fixed include/calls to make the project compile

Florian DORMONT 10 years ago
parent
commit
0107000692
3 changed files with 5 additions and 6 deletions
  1. 0 0
      include/Graphics.h
  2. 3 4
      src/Map.cpp
  3. 2 2
      src/main.cpp

+ 0 - 0
include/graphics.h → include/Graphics.h


+ 3 - 4
src/Map.cpp

@@ -1,6 +1,6 @@
 #include "Map.h"
 #include "Map.h"
 #include "Camera.h"
 #include "Camera.h"
-#include "graphics.h"
+#include "Graphics.h"
 #include "sprites.h"
 #include "sprites.h"
 #include "misc.h"
 #include "misc.h"
 
 
@@ -31,7 +31,7 @@ void MAP::render(WalrusRPG::Camera &camera, unsigned dt) const
 	unsigned offset_x = camera.get_x() % 24 * -1;
 	unsigned offset_x = camera.get_x() % 24 * -1;
 	unsigned offset_y = camera.get_y() % 24 * -1;
 	unsigned offset_y = camera.get_y() % 24 * -1;
 
 
-	Rect_t sprite;
+	WalrusRPG::Graphics::Rect_t sprite;
 	sprite.y = 0;
 	sprite.y = 0;
 	sprite.w = 24;
 	sprite.w = 24;
 	sprite.h = 24;
 	sprite.h = 24;
@@ -42,7 +42,7 @@ void MAP::render(WalrusRPG::Camera &camera, unsigned dt) const
 		{
 		{
 			sprite.x = this->layer0[(camera.get_x() / 24 + i) + (camera.get_y() / 24 + j) * this->width] * 24;
 			sprite.x = this->layer0[(camera.get_x() / 24 + i) + (camera.get_y() / 24 + j) * this->width] * 24;
 			draw_sprite_sheet(tiles, offset_x + i * 24, offset_y + j * 24, &sprite);
 			draw_sprite_sheet(tiles, offset_x + i * 24, offset_y + j * 24, &sprite);
-		}		
+		}
 	}
 	}
 }
 }
 
 
@@ -51,4 +51,3 @@ bool MAP::entity_collide(Entity &entity) const
 	UNUSED(entity);
 	UNUSED(entity);
 	return false;
 	return false;
 }
 }
-

+ 2 - 2
src/main.cpp

@@ -1,11 +1,12 @@
 #include <os.h>
 #include <os.h>
 #include "timers.h"
 #include "timers.h"
-#include "graphics.h"
+#include "Graphics.h"
 #include "Map.h"
 #include "Map.h"
 #include "Camera.h"
 #include "Camera.h"
 #include "misc.h"
 #include "misc.h"
 
 
 using namespace WalrusRPG;
 using namespace WalrusRPG;
+using namespace WalrusRPG::Graphics;
 
 
 void map_loop(unsigned x, unsigned y, Map &map)
 void map_loop(unsigned x, unsigned y, Map &map)
 {
 {
@@ -104,4 +105,3 @@ int main(int argc, char *argv[])
 	buffer_free();
 	buffer_free();
 	return 0;
 	return 0;
 }
 }
-