OSDN Git Service

原作のv1.5.1へのバージョンアップに対応する修正
[starfighter-jp/starfighter-jp.git] / src / resources.cpp
index 09ead65..6ff1229 100644 (file)
@@ -1,7 +1,7 @@
 /*
 Copyright (C) 2003 Parallel Realities
 Copyright (C) 2011, 2012, 2013 Guus Sliepen
-Copyright (C) 2015 Julian Marchant
+Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,135 +21,242 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 void loadBackground(const char *filename)
 {
-       if (background != NULL)
+       if (gfx_background != NULL)
        {
-               SDL_FreeSurface(background);
-               background = NULL;
+               SDL_FreeSurface(gfx_background);
+               gfx_background = NULL;
        }
-       background = loadImage(filename);
-       SDL_SetColorKey(background, 0, 0);
+       gfx_background = gfx_loadImage(filename);
+       SDL_SetColorKey(gfx_background, 0, 0);
 }
 
 void loadGameGraphics()
 {
-       int index;
-       char string[75] = "";
-       FILE *fp;
        Uint32 *p32;
        Uint16 *p16;
        Uint8 *p8;
 
-       freeGraphics();
-
-       shipShape[0] = loadImage("gfx/firefly1.png");
-       shipShape[1] = loadImage("gfx/firefly2.png");
-
-       switch(game.system)
-       {
-               case 0:
-                       strcpy(string, "data/resources_spirit.dat");
-                       break;
-               case 1:
-                       strcpy(string, "data/resources_eyananth.dat");
-                       break;
-               case 2:
-                       strcpy(string, "data/resources_mordor.dat");
-                       break;
-               case 3:
-                       strcpy(string, "data/resources_sol.dat");
-                       break;
-       }
-
-       fp = fopen(string, "rb");
-
-       if (fp == NULL)
-               exit(1);
-
-       while (fscanf(fp, "%d %s", &index, string) == 2)
-       {
-               shipShape[index] = loadImage(string);
-       }
-
-       fclose(fp);
+       gfx_free();
+
+       // Faces
+       gfx_faceSprites[FS_CHRIS] = gfx_loadImage("gfx/face_chris.png");
+       gfx_faceSprites[FS_SID] = gfx_loadImage("gfx/face_sid.png");
+       gfx_faceSprites[FS_KRASS] = gfx_loadImage("gfx/face_krass.png");
+       gfx_faceSprites[FS_PHOEBE] = gfx_loadImage("gfx/face_phoebe.png");
+       gfx_faceSprites[FS_URSULA] = gfx_loadImage("gfx/face_ursula.png");
+       gfx_faceSprites[FS_KLINE] = gfx_loadImage("gfx/face_kline.png");
+       gfx_faceSprites[FS_CREW] = gfx_loadImage("gfx/face_crew.png");
+
+       // Ships
+       gfx_shipSprites[SS_FIREFLY] = gfx_loadImage("gfx/firefly1.png");
+       gfx_shipSprites[SS_FIREFLY_L] = gfx_loadImage("gfx/firefly2.png");
+       gfx_shipSprites[SS_SID] = gfx_loadImage("gfx/sid1.png");
+       gfx_shipSprites[SS_SID_L] = gfx_loadImage("gfx/sid2.png");
+       gfx_shipSprites[SS_FRIEND] = gfx_loadImage("gfx/wingmate1.png");
+       gfx_shipSprites[SS_FRIEND_L] = gfx_loadImage("gfx/wingmate2.png");
+       gfx_shipSprites[SS_GOODTRANSPORT] = gfx_loadImage("gfx/goodTrans1.png");
+       gfx_shipSprites[SS_GOODTRANSPORT_L] = gfx_loadImage("gfx/goodTrans2.png");
+       gfx_shipSprites[SS_REBELCARRIER] = gfx_loadImage("gfx/rebelCarrier1.png");
+       gfx_shipSprites[SS_REBELCARRIER_L] = gfx_loadImage("gfx/rebelCarrier2.png");
+       gfx_shipSprites[SS_DUALFIGHTER] = gfx_loadImage("gfx/dualFighter1.png");
+       gfx_shipSprites[SS_DUALFIGHTER_L] = gfx_loadImage("gfx/dualFighter2.png");
+       gfx_shipSprites[SS_MISSILEBOAT] = gfx_loadImage("gfx/missileBoat1.png");
+       gfx_shipSprites[SS_MISSILEBOAT_L] = gfx_loadImage("gfx/missileBoat2.png");
+       gfx_shipSprites[SS_PROTOFIGHTER] = gfx_loadImage("gfx/eliteFighter1.png");
+       gfx_shipSprites[SS_PROTOFIGHTER_L] = gfx_loadImage("gfx/eliteFighter2.png");
+       gfx_shipSprites[SS_AIMFIGHTER] = gfx_loadImage("gfx/aimFighter1.png");
+       gfx_shipSprites[SS_AIMFIGHTER_L] = gfx_loadImage("gfx/aimFighter2.png");
+       gfx_shipSprites[SS_DRONE] = gfx_loadImage("gfx/drone1.png");
+       gfx_shipSprites[SS_DRONE_L] = gfx_loadImage("gfx/drone2.png");
+       gfx_shipSprites[SS_MINER] = gfx_loadImage("gfx/miner1.png");
+       gfx_shipSprites[SS_MINER_L] = gfx_loadImage("gfx/miner2.png");
+       gfx_shipSprites[SS_ESCORT] = gfx_loadImage("gfx/escort1.png");
+       gfx_shipSprites[SS_ESCORT_L] = gfx_loadImage("gfx/escort2.png");
+       gfx_shipSprites[SS_MOBILE_RAY] = gfx_loadImage("gfx/mobileCannon1.png");
+       gfx_shipSprites[SS_MOBILE_RAY_L] = gfx_loadImage("gfx/mobileCannon2.png");
+       gfx_shipSprites[SS_TRANSPORTSHIP] = gfx_loadImage("gfx/transport1.png");
+       gfx_shipSprites[SS_TRANSPORTSHIP_L] = gfx_loadImage("gfx/transport2.png");
+       gfx_shipSprites[SS_CARGOSHIP] = gfx_loadImage("gfx/tug1.png");
+       gfx_shipSprites[SS_CARGOSHIP_L] = gfx_loadImage("gfx/tug2.png");
+       gfx_shipSprites[SS_SLAVETRANSPORT] = gfx_loadImage("gfx/slaveTrans1.png");
+       gfx_shipSprites[SS_SLAVETRANSPORT_L] = gfx_loadImage("gfx/slaveTrans2.png");
+       gfx_shipSprites[SS_BARRIER] = gfx_loadImage("gfx/barrier.png");
+       gfx_shipSprites[SS_MOBILESHIELD] = gfx_loadImage("gfx/mobileShield1.png");
+       gfx_shipSprites[SS_MOBILESHIELD_L] = gfx_loadImage("gfx/mobileShield2.png");
+       gfx_shipSprites[SS_ASTEROID] = gfx_loadImage("gfx/asteroid1.png");
+       gfx_shipSprites[SS_ASTEROID_SMALL] = gfx_loadImage("gfx/asteroid2.png");
+       gfx_shipSprites[SS_ASTEROID_SMALL_L] = gfx_loadImage("gfx/asteroid3.png");
+       gfx_shipSprites[SS_CLOAKFIGHTER] = gfx_loadImage("gfx/cloakShip1.png");
+       gfx_shipSprites[SS_CLOAKFIGHTER_L] = gfx_loadImage("gfx/cloakShip2.png");
+       gfx_shipSprites[SS_EVILURSULA] = gfx_loadImage("gfx/evilUrsula1.png");
+       gfx_shipSprites[SS_EVILURSULA_L] = gfx_loadImage("gfx/evilUrsula2.png");
+       gfx_shipSprites[SS_KRASS] = gfx_loadImage("gfx/merc1.png");
+       gfx_shipSprites[SS_KRASS_L] = gfx_loadImage("gfx/merc2.png");
+       gfx_shipSprites[SS_FRIGATE] = gfx_loadImage("gfx/frigateBody1.png");
+       gfx_shipSprites[SS_FRIGATE_L] = gfx_loadImage("gfx/frigateBody2.png");
+       gfx_shipSprites[SS_FRIGATE_WING1] = gfx_loadImage("gfx/frigateGun11.png");
+       gfx_shipSprites[SS_FRIGATE_WING1_L] = gfx_loadImage("gfx/frigateGun12.png");
+       gfx_shipSprites[SS_FRIGATE_WING2] = gfx_loadImage("gfx/frigateGun21.png");
+       gfx_shipSprites[SS_FRIGATE_WING2_L] = gfx_loadImage("gfx/frigateGun22.png");
+       gfx_shipSprites[SS_MINERBOSS] = gfx_loadImage("gfx/mineBoss1.png");
+       gfx_shipSprites[SS_MINERBOSS_L] = gfx_loadImage("gfx/mineBoss2.png");
+       gfx_shipSprites[SS_MINERBOSS_WING1] = gfx_loadImage("gfx/mineBossWing11.png");
+       gfx_shipSprites[SS_MINERBOSS_WING1_L] = gfx_loadImage("gfx/mineBossWing12.png");
+       gfx_shipSprites[SS_MINERBOSS_WING2] = gfx_loadImage("gfx/mineBossWing21.png");
+       gfx_shipSprites[SS_MINERBOSS_WING2_L] = gfx_loadImage("gfx/mineBossWing22.png");
+       gfx_shipSprites[SS_MINERBOSS_WING3] = gfx_loadImage("gfx/mineBossWing31.png");
+       gfx_shipSprites[SS_MINERBOSS_WING3_L] = gfx_loadImage("gfx/mineBossWing32.png");
+       gfx_shipSprites[SS_MINERBOSS_WING4] = gfx_loadImage("gfx/mineBossWing41.png");
+       gfx_shipSprites[SS_MINERBOSS_WING4_L] = gfx_loadImage("gfx/mineBossWing42.png");
+       gfx_shipSprites[SS_EXEC] = gfx_loadImage("gfx/execTrans1.png");
+       gfx_shipSprites[SS_EXEC_L] = gfx_loadImage("gfx/execTrans2.png");
+       gfx_shipSprites[SS_PLUTOBOSS] = gfx_loadImage("gfx/plutoBoss1.png");
+       gfx_shipSprites[SS_PLUTOBOSS_L] = gfx_loadImage("gfx/plutoBoss2.png");
+       gfx_shipSprites[SS_URANUSBOSS] = gfx_loadImage("gfx/splitBoss11.png");
+       gfx_shipSprites[SS_URANUSBOSS_L] = gfx_loadImage("gfx/splitBoss12.png");
+       gfx_shipSprites[SS_URANUSBOSS_WING1] = gfx_loadImage("gfx/splitBoss21.png");
+       gfx_shipSprites[SS_URANUSBOSS_WING1_L] = gfx_loadImage("gfx/splitBoss22.png");
+       gfx_shipSprites[SS_URANUSBOSS_WING2] = gfx_loadImage("gfx/splitBoss31.png");
+       gfx_shipSprites[SS_URANUSBOSS_WING2_L] = gfx_loadImage("gfx/splitBoss32.png");
+       gfx_shipSprites[SS_KLINE] = gfx_loadImage("gfx/kline11.png");
+       gfx_shipSprites[SS_KLINE_L] = gfx_loadImage("gfx/kline12.png");
 
        /*
        Create images of ships being hit that show a lot of red
        */
-       for (int i = SHIP_HIT_INDEX ; i < MAX_SHIPSHAPES ; i++)
+       for (int i = SS_HIT_INDEX ; i < SS_MAX ; i++)
        {
-               if (shipShape[i - SHIP_HIT_INDEX] == NULL)
+               if (gfx_shipSprites[i - SS_HIT_INDEX] == NULL)
                        continue;
-               shipShape[i] = createSurface(shipShape[i - SHIP_HIT_INDEX]->w,
-                       shipShape[i - SHIP_HIT_INDEX]->h);
-               SDL_SetSurfaceBlendMode(shipShape[i - SHIP_HIT_INDEX], SDL_BLENDMODE_NONE);
-               blit(shipShape[i - SHIP_HIT_INDEX], 0, 0, shipShape[i]);
-               SDL_SetSurfaceBlendMode(shipShape[i - SHIP_HIT_INDEX], SDL_BLENDMODE_BLEND);
+               gfx_shipSprites[i] = gfx_createSurface(gfx_shipSprites[i - SS_HIT_INDEX]->w,
+                       gfx_shipSprites[i - SS_HIT_INDEX]->h);
+               SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SS_HIT_INDEX], SDL_BLENDMODE_NONE);
+               gfx_blit(gfx_shipSprites[i - SS_HIT_INDEX], 0, 0, gfx_shipSprites[i]);
+               SDL_SetSurfaceBlendMode(gfx_shipSprites[i - SS_HIT_INDEX], SDL_BLENDMODE_BLEND);
 
-               switch (shipShape[i]->format->BitsPerPixel)
+               switch (gfx_shipSprites[i]->format->BitsPerPixel)
                {
                        case 32:
-                               SDL_LockSurface(shipShape[i]);
-                               p32 = (Uint32 *)shipShape[i]->pixels;
-                               for (int j = 0; j < shipShape[i]->w * shipShape[i]->h; j++)
+                               SDL_LockSurface(gfx_shipSprites[i]);
+                               p32 = (Uint32 *)gfx_shipSprites[i]->pixels;
+                               for (int j = 0; j < gfx_shipSprites[i]->w * gfx_shipSprites[i]->h; j++)
                                {
                                        if (p32[j])
-                                               p32[j] |= shipShape[i]->format->Rmask;
+                                               p32[j] |= gfx_shipSprites[i]->format->Rmask;
                                }
-                               SDL_UnlockSurface(shipShape[i]);
+                               SDL_UnlockSurface(gfx_shipSprites[i]);
                                break;
 
                        case 16:
-                               SDL_LockSurface(shipShape[i]);
-                               p16 = (Uint16 *)shipShape[i]->pixels;
-                               for (int j = 0; j < shipShape[i]->w * shipShape[i]->h; j++)
+                               SDL_LockSurface(gfx_shipSprites[i]);
+                               p16 = (Uint16 *)gfx_shipSprites[i]->pixels;
+                               for (int j = 0; j < gfx_shipSprites[i]->w * gfx_shipSprites[i]->h; j++)
                                {
                                        if (p16[j])
-                                               p16[j] |= shipShape[i]->format->Rmask;
+                                               p16[j] |= gfx_shipSprites[i]->format->Rmask;
                                }
-                               SDL_UnlockSurface(shipShape[i]);
+                               SDL_UnlockSurface(gfx_shipSprites[i]);
                                break;
 
                        case 8:
-                               SDL_LockSurface(shipShape[i]);
-                               p8 = (Uint8 *)shipShape[i]->pixels;
-                               for (int j = 0; j < shipShape[i]->w * shipShape[i]->h; j++)
+                               SDL_LockSurface(gfx_shipSprites[i]);
+                               p8 = (Uint8 *)gfx_shipSprites[i]->pixels;
+                               for (int j = 0; j < gfx_shipSprites[i]->w * gfx_shipSprites[i]->h; j++)
                                {
                                        if (p8[j])
-                                               p8[j] = SDL_MapRGB(shipShape[i]->format, 255, 0, 0);
+                                               p8[j] = SDL_MapRGB(gfx_shipSprites[i]->format, 255, 0, 0);
                                }
-                               SDL_UnlockSurface(shipShape[i]);
+                               SDL_UnlockSurface(gfx_shipSprites[i]);
                                break;
                }
 
-               SDL_SetColorKey(shipShape[i], SDL_TRUE,
-                       SDL_MapRGB(shipShape[i]->format, 0, 0, 0));
-       }
-
-       strcpy(string, "data/resources_all.dat");
-
-       fp = fopen(string, "rb");
-
-       while (fscanf(fp, "%d %s", &index, string) == 2)
-       {
-               shape[index] = loadImage(string);
+               SDL_SetColorKey(gfx_shipSprites[i], SDL_TRUE,
+                       SDL_MapRGB(gfx_shipSprites[i]->format, 0, 0, 0));
        }
 
-       fclose(fp);
+       // Other sprites
+       gfx_sprites[SP_PLASMA_GREEN] = gfx_loadImage("gfx/plasmaGreen.png");
+       gfx_sprites[SP_PLASMA_RED] = gfx_loadImage("gfx/plasmaRed.png");
+       gfx_sprites[SP_DIR_PLASMA_GREEN] = gfx_loadImage("gfx/greenDir.png");
+       gfx_sprites[SP_DIR_PLASMA_RED] = gfx_loadImage("gfx/redDir.png");
+       gfx_sprites[SP_ROCKET] = gfx_loadImage("gfx/rocket1.png");
+       gfx_sprites[SP_ROCKET_L] = gfx_loadImage("gfx/rocket2.png");
+       gfx_sprites[SP_SMALL_EXPLOSION] = gfx_loadImage("gfx/explode1.png");
+       gfx_sprites[SP_SMALL_EXPLOSION_2] = gfx_loadImage("gfx/explode2.png");
+       gfx_sprites[SP_SMALL_EXPLOSION_3] = gfx_loadImage("gfx/explode3.png");
+       gfx_sprites[SP_SMALL_EXPLOSION_L] = gfx_loadImage("gfx/explode4.png");
+       gfx_sprites[SP_BIG_EXPLOSION] = gfx_loadImage("gfx/explode05.png");
+       gfx_sprites[SP_BIG_EXPLOSION_2] = gfx_loadImage("gfx/explode06.png");
+       gfx_sprites[SP_BIG_EXPLOSION_3] = gfx_loadImage("gfx/explode07.png");
+       gfx_sprites[SP_BIG_EXPLOSION_L] = gfx_loadImage("gfx/explode08.png");
+       gfx_sprites[SP_SMOKE] = gfx_loadImage("gfx/explode9.png");
+       gfx_sprites[SP_SMOKE_2] = gfx_loadImage("gfx/explode10.png");
+       gfx_sprites[SP_SMOKE_3] = gfx_loadImage("gfx/explode11.png");
+       gfx_sprites[SP_SMOKE_L] = gfx_loadImage("gfx/explode12.png");
+       gfx_sprites[SP_TINY_EXPLOSION] = gfx_loadImage("gfx/explode13.png");
+       gfx_sprites[SP_TINY_EXPLOSION_2] = gfx_loadImage("gfx/explode14.png");
+       gfx_sprites[SP_TINY_EXPLOSION_3] = gfx_loadImage("gfx/explode15.png");
+       gfx_sprites[SP_TINY_EXPLOSION_L] = gfx_loadImage("gfx/explode16.png");
+       gfx_sprites[SP_ELECTRICAL] = gfx_loadImage("gfx/elec1.png");
+       gfx_sprites[SP_ELECTRICAL_2] = gfx_loadImage("gfx/elec2.png");
+       gfx_sprites[SP_ELECTRICAL_3] = gfx_loadImage("gfx/elec3.png");
+       gfx_sprites[SP_ELECTRICAL_L] = gfx_loadImage("gfx/elec4.png");
+       gfx_sprites[SP_PICKUP_MONEY] = gfx_loadImage("gfx/dollar.png");
+       gfx_sprites[SP_PICKUP_PLASMA] = gfx_loadImage("gfx/rocket.png");
+       gfx_sprites[SP_PICKUP_SHIELD] = gfx_loadImage("gfx/heart.png");
+       gfx_sprites[SP_PICKUP_PLASMA_OUTPUT] = gfx_loadImage("gfx/plasmaAmmo.png");
+       gfx_sprites[SP_PICKUP_PLASMA_RATE] = gfx_loadImage("gfx/plasmaRate.png");
+       gfx_sprites[SP_PICKUP_PLASMA_POWER] = gfx_loadImage("gfx/plasmaDamage.png");
+       gfx_sprites[SP_CHAIN_LINK] = gfx_loadImage("gfx/chainLink.png");
+       gfx_sprites[SP_MINE] = gfx_loadImage("gfx/mine.png");
+       gfx_sprites[SP_CARGO] = gfx_loadImage("gfx/cargo1.png");
+       gfx_sprites[SP_ION] = gfx_loadImage("gfx/stunBolt.png");
+       gfx_sprites[SP_ARROW_NORTH] = gfx_loadImage("gfx/arrowNorth.png");
+       gfx_sprites[SP_ARROW_NORTHEAST] = gfx_loadImage("gfx/arrowNorthEast.png");
+       gfx_sprites[SP_ARROW_EAST] = gfx_loadImage("gfx/arrowEast.png");
+       gfx_sprites[SP_ARROW_SOUTHEAST] = gfx_loadImage("gfx/arrowSouthEast.png");
+       gfx_sprites[SP_ARROW_SOUTH] = gfx_loadImage("gfx/arrowSouth.png");
+       gfx_sprites[SP_ARROW_SOUTHWEST] = gfx_loadImage("gfx/arrowSouthWest.png");
+       gfx_sprites[SP_ARROW_WEST] = gfx_loadImage("gfx/arrowWest.png");
+       gfx_sprites[SP_ARROW_NORTHWEST] = gfx_loadImage("gfx/arrowNorthWest.png");
+       gfx_sprites[SP_ARROW_FRIEND_NORTH] = gfx_loadImage("gfx/friendArrowNorth.png");
+       gfx_sprites[SP_ARROW_FRIEND_NORTHEAST] = gfx_loadImage("gfx/friendArrowNorthEast.png");
+       gfx_sprites[SP_ARROW_FRIEND_EAST] = gfx_loadImage("gfx/friendArrowEast.png");
+       gfx_sprites[SP_ARROW_FRIEND_SOUTHEAST] = gfx_loadImage("gfx/friendArrowSouthEast.png");
+       gfx_sprites[SP_ARROW_FRIEND_SOUTH] = gfx_loadImage("gfx/friendArrowSouth.png");
+       gfx_sprites[SP_ARROW_FRIEND_SOUTHWEST] = gfx_loadImage("gfx/friendArrowSouthWest.png");
+       gfx_sprites[SP_ARROW_FRIEND_WEST] = gfx_loadImage("gfx/friendArrowWest.png");
+       gfx_sprites[SP_ARROW_FRIEND_NORTHWEST] = gfx_loadImage("gfx/friendArrowNorthWest.png");
+       gfx_sprites[SP_INDICATOR_TARGET] = gfx_loadImage("gfx/targetText.png");
+       gfx_sprites[SP_INDICATOR_SID] = gfx_loadImage("gfx/sidText.png");
+       gfx_sprites[SP_INDICATOR_PHOEBE] = gfx_loadImage("gfx/phoebeText.png");
+       gfx_sprites[SP_INDICATOR_URSULA] = gfx_loadImage("gfx/ursulaText.png");
+       gfx_sprites[SP_INDICATOR_KLINE] = gfx_loadImage("gfx/klineText.png");
+       gfx_sprites[SP_ESCAPE_POD] = gfx_loadImage("gfx/pod.png");
+       gfx_sprites[SP_ORE] = gfx_loadImage("gfx/ore1.png");
+       gfx_sprites[SP_ORE_2] = gfx_loadImage("gfx/ore2.png");
+       gfx_sprites[SP_ORE_L] = gfx_loadImage("gfx/ore3.png");
+       gfx_sprites[SP_PICKUP_ROCKETS] = gfx_loadImage("gfx/rocketAmmo.png");
+       gfx_sprites[SP_SUPERCHARGE] = gfx_loadImage("gfx/superCharge.png");
 
        loadBackground(systemBackground[game.system]);
 
        for (int i = 0 ; i < CD_MAX ; i++)
        {
-               if (shipShape[alien_defs[i].imageIndex[0]] != NULL)
+               if (gfx_shipSprites[alien_defs[i].imageIndex[0]] != NULL)
                {
-                       alien_defs[i].image[0] = shipShape[alien_defs[i].imageIndex[0]];
-                       alien_defs[i].image[1] = shipShape[alien_defs[i].imageIndex[1]];
+                       alien_defs[i].image[0] = gfx_shipSprites[alien_defs[i].imageIndex[0]];
+                       alien_defs[i].image[1] = gfx_shipSprites[alien_defs[i].imageIndex[1]];
                        alien_defs[i].engineX = alien_defs[i].image[0]->w;
                        alien_defs[i].engineY = (alien_defs[i].image[0]->h / 2);
                }
        }
 
-       setWeaponShapes();
+       for (int i = 0 ; i < W_MAX ; i++)
+       {
+               weapon[i].image[0] = gfx_sprites[weapon[i].imageIndex[0]];
+               weapon[i].image[1] = gfx_sprites[weapon[i].imageIndex[1]];
+       }
 }
 
 
@@ -161,7 +268,7 @@ void loadFont()
 {
        SDL_Surface *image, *newImage;
 
-       for (int i = 0 ; i < MAX_FONTSHAPES ; i++)
+       for (int i = 0 ; i < FONT_MAX ; i++)
        {
                image = IMG_Load("gfx/smallFont.png");
 
@@ -172,26 +279,26 @@ void loadFont()
 
                switch(i)
                {
-                       case 1:
+                       case FONT_RED:
                                SDL_SetSurfaceColorMod(image, 255, 0, 0);
                                break;
-                       case 2:
+                       case FONT_YELLOW:
                                SDL_SetSurfaceColorMod(image, 255, 255, 0);
                                break;
-                       case 3:
+                       case FONT_GREEN:
                                SDL_SetSurfaceColorMod(image, 0, 255, 0);
                                break;
-                       case 4:
+                       case FONT_CYAN:
                                SDL_SetSurfaceColorMod(image, 0, 255, 255);
                                break;
-                       case 5:
+                       case FONT_OUTLINE:
                                SDL_SetSurfaceColorMod(image, 0, 0, 10);
                                break;
                }
 
                newImage = SDL_ConvertSurface(image, screen->format, 0);
 
-               fontShape[i] = setTransparent(newImage);
+               gfx_fontSprites[i] = gfx_setTransparent(newImage);
 
                SDL_FreeSurface(image);
        }