diff options
author | Ludovic Pouzenc <lpouzenc@gmail.com> | 2013-07-23 20:48:22 +0200 |
---|---|---|
committer | Ludovic Pouzenc <lpouzenc@gmail.com> | 2013-07-23 20:48:22 +0200 |
commit | 5bd7068586d82cf8d11c9751b86062c2ab031946 (patch) | |
tree | ea8a7de0944543bb7ed5a46b8b27e1fad5949a35 /src/loader.c | |
parent | 8d9a2b8fd5d2088d699c2bceb3a54592c33b7b84 (diff) | |
download | mplemmings-5bd7068586d82cf8d11c9751b86062c2ab031946.tar.gz mplemmings-5bd7068586d82cf8d11c9751b86062c2ab031946.tar.bz2 mplemmings-5bd7068586d82cf8d11c9751b86062c2ab031946.zip |
Gros refactoring alors que j'ai oublié de faire un git pull avant, ça va etre sympa...
Diffstat (limited to 'src/loader.c')
-rw-r--r-- | src/loader.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/loader.c b/src/loader.c index ec34e79..f780ae9 100644 --- a/src/loader.c +++ b/src/loader.c @@ -25,7 +25,7 @@ int loadStyleRes(SDL_Renderer *rend, gameIni_t *gIni, char data_basepath[], game /* Some object types needs a mask */ if ( gIni->style.type[i] >= 5 && gIni->style.type[i] <= 8 ) { (void) SDL_snprintf(filepath, MAX_PATH_LEN, "%s/style/%s/%som_%d.gif", data_basepath, stylename, stylename, i); - res=loadSprite(rend,filepath,1,&gRess->objectMasks[i]); + res=loadSurface(rend,filepath,&gRess->objectMasks[i]); if (res != 0) return res; } } @@ -38,12 +38,11 @@ void unloadStyleRes(gameRess_t *gRess) { /* Nullpointer checked for surface but not for textures in SDL code */ for(i=0; i<MAX_TILES_COUNT;i++) { - SDL_FreeSurface(gRess->tiles[i]); - gRess->tiles[i] = NULL; + DESTROYSURFACE_SAFE(gRess->tiles[i]); } for(i=0; i<MAX_OBJECTS_COUNT;i++) { DESTROYTEXTURE_SAFE(gRess->objects[i].t); - DESTROYTEXTURE_SAFE(gRess->objectMasks[i].t); + DESTROYSURFACE_SAFE(gRess->objectMasks[i]); } } @@ -65,14 +64,14 @@ int loadMiscRes(SDL_Renderer *rend, char data_basepath[], gameRess_t *gRess) { for(ii=0; ii<6; ii++) { i=lemmanim_hasmask[ii]; (void) SDL_snprintf(filepath, MAX_PATH_LEN, "%s/misc/mask_%d.gif", data_basepath, i); - res=loadSprite(rend,filepath,1,&gRess->lemmingMasks[i]); + res=loadSurface(rend,filepath,&gRess->lemmingMasks[i]); if (res != 0) return res; } for(ii=0; ii<3; ii++) { i=lemmanim_hasimask[ii]; (void) SDL_snprintf(filepath, MAX_PATH_LEN, "%s/misc/imask_%d.gif", data_basepath, i); - res=loadSprite(rend,filepath,1,&gRess->lemmingIMasks[i]); + res=loadSurface(rend,filepath,&gRess->lemmingIMasks[i]); if (res != 0) return res; } @@ -99,8 +98,8 @@ void unloadMiscRes(gameRess_t *gRess) { int i; for(i=0; i<MAX_LEMMANIM_COUNT; i++) { DESTROYTEXTURE_SAFE(gRess->lemmingAnims[i].t); - DESTROYTEXTURE_SAFE(gRess->lemmingMasks[i].t); - DESTROYTEXTURE_SAFE(gRess->lemmingIMasks[i].t); + DESTROYSURFACE_SAFE(gRess->lemmingMasks[i]); + DESTROYSURFACE_SAFE(gRess->lemmingIMasks[i]); } DESTROYTEXTURE_SAFE(gRess->cursor.t); DESTROYTEXTURE_SAFE(gRess->countdown.t); |