From c978f746058497ddd9ddc9cf3e156c4453e487f1 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Fri, 15 Feb 2013 15:28:42 -0500
Subject: Add resource manager and move src/image.*.

---
(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index b30d0b2..24e9e1e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,20 +1,29 @@
 #include <SDL.h>
 #include "init.h"
 #include "logging.h"
-#include "image.h"
+#include "resources/image.h"
 #include "tmx.h"
 
 int
 main(void)
 {
-	SDL_Surface *img;
+	struct image *img;
 	SDL_Rect imgrect, surfacerect;
 
 	init();
 
 	tmx_load("data/forest1.tmx");
 
-	img = load_png("../forest-6-layer-test_ground.png");
+	img = img_png_get("../forest-6-layer-test_ground.png");
+	img_png_free(img);
+	img = img_png_get("../forest-6-layer-test_ground.png");
+	img = img_png_get("../forest-6-layer-test_ground.png");
+	img = img_png_get("../forest-6-layer-test_ground.png");
+	img = img_png_get("../forest-6-layer-test_ground.png");
+	img_png_free(img);
+	img_png_free(img);
+	img_png_free(img);
+	img = img_png_get("../forest-6-layer-test_ground.png");
 	imgrect.w = 240;
 	imgrect.h = 160;
 	surfacerect.x = 0;
@@ -24,37 +33,37 @@ main(void)
 
 	imgrect.x = 208;
 	imgrect.y = 480;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
 	imgrect.x = 208;
 	imgrect.y = 464;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
 	imgrect.x = 224;
 	imgrect.y = 464;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
 	imgrect.x = 240;
 	imgrect.y = 464;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
 	imgrect.x = 256;
 	imgrect.y = 464;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
 	imgrect.x = 256;
 	imgrect.y = 448;
-	SDL_BlitSurface(img, &imgrect, screen, &surfacerect);
+	SDL_BlitSurface(img->image, &imgrect, screen, &surfacerect);
 	SDL_Flip(screen);
 	SDL_Delay(500);
 
--
cgit v0.9.1