diff options
author | Olivier Gayot <duskcoder@gmail.com> | 2014-10-26 18:20:28 +0000 |
---|---|---|
committer | Olivier Gayot <duskcoder@gmail.com> | 2014-10-26 18:20:54 +0000 |
commit | e816f16a5007798968f4c9003b3159a45485e88f (patch) | |
tree | 86be1ca571b383ba1d532fa655991d099903732a /structures.h | |
parent | f290b8cd7e40ed8688175fba312697f7da96a34e (diff) |
game: remove useless checks
it is safe to pass a null pointer to SDL_FreeSurface()
BTW: change the format of the files from dos to unix
Signed-off-by: Olivier Gayot <duskcoder@gmail.com>
Diffstat (limited to 'structures.h')
-rw-r--r-- | structures.h | 238 |
1 files changed, 119 insertions, 119 deletions
diff --git a/structures.h b/structures.h index 8b8783f..fdb2ecb 100644 --- a/structures.h +++ b/structures.h @@ -1,119 +1,119 @@ -#ifndef STRUCTURES_H
-#define STRUCTURES_H
-
-typedef struct surfaces SURFACES;
-struct surfaces
-{
- SDL_Surface *Pecran;
- SDL_Surface *Pgobelin;
- SDL_Surface *Ppaladin;
- SDL_Surface *Ppretre;
- SDL_Surface *Pvoleur;
- SDL_Surface *Pmenuoptions;
- SDL_Surface *Pmenujouer;
- SDL_Surface *Pmenuquitter;
- SDL_Surface *Pchoixpaladin;
- SDL_Surface *Pchoixpretre;
- SDL_Surface *Pchoixvoleur;
- SDL_Surface *Tperso[3];
- SDL_Surface *Tennemi[5];
- SDL_Surface *Ptextechoixmenu;
- SDL_Surface *Pcurseurennemis;
- SDL_Surface *Pcurseurallies;
- SDL_Surface *Pfondjeu;
- 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;
- SDL_Surface *Pmap_perso;
-};
-
-typedef struct positions POSITIONS;
-struct positions
-{
- SDL_Rect Vpositionmenu;
- 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];
- SDL_Rect Vpositionpvcible;
- SDL_Rect Vpositionpmcible;
- SDL_Rect Vpositioncadreactions;
- SDL_Rect Vpositionactionselectionnee[3];
- 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];
-};
-
-typedef struct personnages PERSONNAGES;
-struct personnages
-{
- int classe;
- int nv;
- int pv;
- int pm;
- int magie;
- int force;
- int defense;
- int defensemagique;
- int xp;
- int etat;
- int pvinitiaux;
- int pminitiaux;
-};
-
-typedef struct ennemis ENNEMIS;
-struct ennemis
-{
- int classe;
- int pv;
- int pm;
- int magie;
- int force;
- int defense;
- int defensemagique;
- int etat;
- int sensibilite[4];
- int resistance[4];
- int invulnerabilite[4];
- int absorbtion[4];
- int pvinitiaux;
- int pminitiaux;
-};
-
-typedef struct objets OBJET;
-struct objets
-{
- int potions;
- int ethers;
- int potionsplus;
- int ethersplus;
-};
-
-#endif
-
+#ifndef STRUCTURES_H +#define STRUCTURES_H + +typedef struct surfaces SURFACES; +struct surfaces +{ + SDL_Surface *Pecran; + SDL_Surface *Pgobelin; + SDL_Surface *Ppaladin; + SDL_Surface *Ppretre; + SDL_Surface *Pvoleur; + SDL_Surface *Pmenuoptions; + SDL_Surface *Pmenujouer; + SDL_Surface *Pmenuquitter; + SDL_Surface *Pchoixpaladin; + SDL_Surface *Pchoixpretre; + SDL_Surface *Pchoixvoleur; + SDL_Surface *Tperso[3]; + SDL_Surface *Tennemi[5]; + SDL_Surface *Ptextechoixmenu; + SDL_Surface *Pcurseurennemis; + SDL_Surface *Pcurseurallies; + SDL_Surface *Pfondjeu; + 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; + SDL_Surface *Pmap_perso; +}; + +typedef struct positions POSITIONS; +struct positions +{ + SDL_Rect Vpositionmenu; + 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]; + SDL_Rect Vpositionpvcible; + SDL_Rect Vpositionpmcible; + SDL_Rect Vpositioncadreactions; + SDL_Rect Vpositionactionselectionnee[3]; + 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]; +}; + +typedef struct personnages PERSONNAGES; +struct personnages +{ + int classe; + int nv; + int pv; + int pm; + int magie; + int force; + int defense; + int defensemagique; + int xp; + int etat; + int pvinitiaux; + int pminitiaux; +}; + +typedef struct ennemis ENNEMIS; +struct ennemis +{ + int classe; + int pv; + int pm; + int magie; + int force; + int defense; + int defensemagique; + int etat; + int sensibilite[4]; + int resistance[4]; + int invulnerabilite[4]; + int absorbtion[4]; + int pvinitiaux; + int pminitiaux; +}; + +typedef struct objets OBJET; +struct objets +{ + int potions; + int ethers; + int potionsplus; + int ethersplus; +}; + +#endif + |