summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorLudovic Pouzenc <lpouzenc@gmail.com>2013-07-18 20:55:55 +0200
committerLudovic Pouzenc <lpouzenc@gmail.com>2013-07-18 20:55:55 +0200
commit2e8fce8250fdfc6c6d644c9354d4a3318975bae8 (patch)
tree058b876910dfb3353cab52f425f837205ee7843b /src/include
parentf02db00ad4f41b4d098557a63461f6c5766c3273 (diff)
downloadmplemmings-2e8fce8250fdfc6c6d644c9354d4a3318975bae8.tar.gz
mplemmings-2e8fce8250fdfc6c6d644c9354d4a3318975bae8.tar.bz2
mplemmings-2e8fce8250fdfc6c6d644c9354d4a3318975bae8.zip
Fin du codage de testrender.c. Diverses mises au point autour de ca.
Bug connu : la police de grande taille ne se charge pas bien. Texture trop longue ?
Diffstat (limited to 'src/include')
-rw-r--r--src/include/graphic.h11
-rw-r--r--src/include/utils.h10
2 files changed, 19 insertions, 2 deletions
diff --git a/src/include/graphic.h b/src/include/graphic.h
index 6188af3..41cd526 100644
--- a/src/include/graphic.h
+++ b/src/include/graphic.h
@@ -5,8 +5,17 @@
#include "data_ini.h"
#include "data_ress.h"
+typedef struct {
+ sprite_t *sprite;
+ int currframe;
+ int animate; /* Is currently animating ? */
+ int x,y; /* Level-based coords, not camera-based */
+} render_item_t;
+
void my_SDL_init_or_die(char title[], SDL_Rect win_pos, Uint32 init_flags, Uint32 win_flags, Uint32 rend_flags, SDL_Window **win, SDL_Renderer **rend, SDL_RendererInfo *rend_info, SDL_Rect *viewport);
-int paintTerrain(gameIni_t *gIni, gameRess_t *gRess, gameGraphics_t *gGraph);
+//int paint_terrain(gameIni_t *gIni, gameRess_t *gRess, gameGraphics_t *gGraph);
+
+void render_all(SDL_Renderer *rend, render_item_t render_list[], int list_size);
#endif /*GRAPHIC_H*/
diff --git a/src/include/utils.h b/src/include/utils.h
index 7f43d8f..11fdeee 100644
--- a/src/include/utils.h
+++ b/src/include/utils.h
@@ -1,4 +1,6 @@
+#define MAX_PATH_LEN 255
+
/* Macro for error checking and logging */
#define MPL_CHECK(expr, fail_code, priority, ...) \
if (! (expr)) { \
@@ -8,4 +10,10 @@
fail_code; \
}
-#define MAX_PATH_LEN 255
+/* Macro that check and set NULL texture pointer when destroying */
+#define DESTROYTEXTURE_SAFE(t) \
+if (t != NULL) { \
+ SDL_DestroyTexture(t); \
+ t=NULL; \
+}
+