summaryrefslogtreecommitdiff
path: root/src/loader.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/loader.c')
-rw-r--r--src/loader.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/loader.c b/src/loader.c
index bd8d8c4..d83087c 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -1,6 +1,7 @@
#include "SDL/SDL_stdinc.h"
#include "SDL/SDL_image.h"
#include "loader.h"
+#include "graphic.h"
#include "utils.h"
#define PATH_STYLE "../styles"
@@ -19,9 +20,9 @@ int loadRessources(gameIni_t *gIni, gameRess_t *gRess) {
}
for(i=0; i < gIni->style.tiles ; ++i) {
snprintf(filepath, filenamelen, "%s/%s/%s_%d.gif", PATH_STYLE, gIni->style.name, gIni->style.name, i);
- gRess->style.tiles[i] = IMG_Load(filepath);
+ gRess->style.tiles[i] = loadGifIn24Bpp(filepath);
if(gRess->style.tiles[i]==NULL) {
- logs2(LOG_WARN, "loadRessources(), IMG_Load() error for ", filepath);
+ logs2(LOG_WARN, "loadRessources(), loadGifIn24Bpp() error for ", filepath);
return 2;
}
}
@@ -41,9 +42,9 @@ int loadRessources(gameIni_t *gIni, gameRess_t *gRess) {
for(i=0; i < gIni->style.objectCount ; ++i) {
snprintf(filepath, filenamelen, "%s/%s/%so_%d.gif", PATH_STYLE, gIni->style.name, gIni->style.name, i);
- gRess->style.objects[i] = IMG_Load(filepath);
+ gRess->style.objects[i] = loadGifIn24Bpp(filepath);
if (gRess->style.objects[i]==NULL) {
- logs2(LOG_WARN, "loadRessources(), IMG_Load() error for ", filepath);
+ logs2(LOG_WARN, "loadRessources(), loadGifIn24Bpp() error for ", filepath);
return 2;
}
@@ -53,9 +54,9 @@ int loadRessources(gameIni_t *gIni, gameRess_t *gRess) {
case 7:
case 8:
snprintf(filepath, filenamelen, "%s/%s/%som_%d.gif", PATH_STYLE, gIni->style.name, gIni->style.name, i);
- gRess->style.objectMasks[i] = IMG_Load(filepath);
+ gRess->style.objectMasks[i] = loadGifIn24Bpp(filepath);
if (gRess->style.objectMasks[i]==NULL) {
- logs2(LOG_WARN, "loadRessources(), IMG_Load() error for ", filepath);
+ logs2(LOG_WARN, "loadRessources(), loadGifIn24Bpp() error for ", filepath);
return 2;
}
break;