summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Gayot <duskcoder@gmail.com>2015-01-07 22:02:49 +0100
committerOlivier Gayot <duskcoder@gmail.com>2015-01-07 23:30:12 +0100
commit2612e584f6aab4515c7da5a7a6ea005d0e8344ba (patch)
tree0f584c91c3c170dd5452bc5370a4b21bf0fb8762
parent45d54652a8005ccae2466a0e4757017c7b337e3b (diff)
Fix invalid blit position
Signed-off-by: Olivier Gayot <duskcoder@gmail.com>
-rw-r--r--blits.c4
-rw-r--r--jouer.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/blits.c b/blits.c
index 45d5ba5..502883f 100644
--- a/blits.c
+++ b/blits.c
@@ -60,9 +60,7 @@ void blit_ally_team(SURFACES *surfaces, POSITIONS *positions, struct team_t *tea
for (int i = 0; i < team->chr_cnt; i++) {
struct character_t *chr = &team->chrs[i];
- /* TODO blit either default or red surf */
- SDL_BlitSurface(chr->def_surf, NULL, surfaces->Pecran, &positions->Vpositionpersos[i]);
-
+ SDL_BlitSurface(chr->surf, NULL, surfaces->Pecran, &chr->pos);
if (!chr->alive) {
positions->Vpositionmort.x=positions->Vpositionpersos[i].x+surfaces->Tperso[i]->w/2-surfaces->Pmort->w/2;
diff --git a/jouer.c b/jouer.c
index ebd0ac2..b792f4f 100644
--- a/jouer.c
+++ b/jouer.c
@@ -118,6 +118,7 @@ int Fjouer (SURFACES *surfaces, POSITIONS *positions, struct team_t *ally,ENNEMI
}
blit_ally_team(surfaces,positions, ally); // on blit les persos sur l'ecran
+
Fblitterennemis(surfaces,positions,ennemis,Vnbennemis); // idem pour les ennemis
Fremplircompetencesennemis(ennemis,Vnbennemis); // on initialise les pv, pm, exp, etc DES ENNEMIS
@@ -290,7 +291,3 @@ void Fremplirobjets(OBJET *objets)
objets->potionsplus=5;
objets->ethersplus=5;
}
-
-
-
-