From b37b127792e09cb7148200e0bccf294892e9a889 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Sun, 11 Jan 2015 01:42:56 +0100 Subject: remove or replace a lot of code for the initialization many structures or positions were not revelant anymore and thus have been removed. some positions were not relative to each other it is sometimes not meaningful to put surfaces in the global scope when they only need to be used once. Signed-off-by: Olivier Gayot --- structures.h | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'structures.h') diff --git a/structures.h b/structures.h index 2c5710e..b26fffa 100644 --- a/structures.h +++ b/structures.h @@ -4,8 +4,7 @@ #include typedef struct surfaces SURFACES; -struct surfaces -{ +struct surfaces { SDL_Surface *Pecran; /* deprecated */ SDL_Surface *screen; @@ -32,28 +31,19 @@ struct surfaces SDL_Surface *Pchoixpretre; SDL_Surface *Pchoixvoleur; - SDL_Surface *Ptextechoixmenu; SDL_Surface *Pcurseurennemis; SDL_Surface *Pcurseurallies; SDL_Surface *Pfondjeu; /* deprecated */ SDL_Surface *background; - SDL_Surface *Pnbdegats; SDL_Surface *Pcadrecible; - SDL_Surface *Pnomcible; SDL_Surface *Pactive; SDL_Surface *Pdesactive; - SDL_Surface *Ppvcible; - SDL_Surface *Ppmcible; - SDL_Surface *Ppvpersos; - SDL_Surface *Ppmpersos; SDL_Surface *Pcadreactions; SDL_Surface *Pactionselectionnee; SDL_Surface *Pactiondesactivee; - SDL_Surface *Pnomactions[3]; SDL_Surface *Pmort; - SDL_Surface *Pquantite[3]; SDL_Surface *Pmap_sol; SDL_Surface *Pmap_mur; SDL_Surface *Pmap_coffre; @@ -61,17 +51,11 @@ struct surfaces }; typedef struct positions POSITIONS; -struct positions -{ - SDL_Rect Vpositionmenu; +struct positions { SDL_Rect Vpositionmenupaladin; SDL_Rect Vpositionmenuvoleur; SDL_Rect Vpositionmenupretre; - SDL_Rect Vpositionpersos[3]; - SDL_Rect Vpositionennemis[5]; SDL_Rect Vpositiontextemenu; - SDL_Rect Vpositioncurseurennemis; - SDL_Rect Vpositioncurseurallies; SDL_Rect Vpositioncadrecible; SDL_Rect Vpositionnomcible; SDL_Rect Vpositionactivedesactive[16]; @@ -82,9 +66,6 @@ struct positions SDL_Rect Vpositionnomactions[3]; SDL_Rect Vpositionmort; SDL_Rect Vpositiondegats; - SDL_Rect Vpositionpvpersos[3]; - SDL_Rect Vpositionpmpersos[3]; - SDL_Rect Vpositionquantite[3]; SDL_Rect Vpositionmap_item[15][11]; SDL_Rect last_cursor; -- cgit v1.2.3