From d6c17d176ffef1657b369643697033ba25c68da0 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 27 Aug 2011 16:18:29 +0200 Subject: [PATCH] Don't use .bmp and .gif anymore, use .png for all lossless graphics. --- code/intermission.cpp | 18 +++++++++--------- code/resources.cpp | 4 ++-- code/title.cpp | 4 ++-- data/resources_all.dat | 34 +++++++++++++++++----------------- data/resources_sol.dat | 4 ++-- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/code/intermission.cpp b/code/intermission.cpp index 1d25786..fa41166 100644 --- a/code/intermission.cpp +++ b/code/intermission.cpp @@ -490,25 +490,25 @@ int galaxyMap() char string[25]; engine.cursor_x = engine.cursor_y = 500; - shape[0] = loadImage("gfx/cursor.bmp"); + shape[0] = loadImage("gfx/cursor.png"); // Icons 1 - 29 for (int i = 0 ; i < 26 ; i++) { - sprintf(string, "gfx/icon%d.bmp", (i + 1)); + sprintf(string, "gfx/icon%d.png", (i + 1)); shape[i + 1] = loadImage(string); } - shape[27] = loadImage("gfx/buyIcon.bmp"); - shape[28] = loadImage("gfx/sellIcon.bmp"); + shape[27] = loadImage("gfx/buyIcon.png"); + shape[28] = loadImage("gfx/sellIcon.png"); shape[29] = loadImage("gfx/firefly1.png"); // Planets 30 - 39 - shape[30] = loadImage("gfx/planet_sun.gif"); - shape[31] = loadImage("gfx/planet_green.gif"); - shape[32] = loadImage("gfx/planet_blue.gif"); - shape[33] = loadImage("gfx/planet_red.gif"); - shape[34] = loadImage("gfx/planet_orange.gif"); + shape[30] = loadImage("gfx/planet_sun.png"); + shape[31] = loadImage("gfx/planet_green.png"); + shape[32] = loadImage("gfx/planet_blue.png"); + shape[33] = loadImage("gfx/planet_red.png"); + shape[34] = loadImage("gfx/planet_orange.png"); // Faces (as defines) shape[FACE_CHRIS] = loadImage("gfx/face_chris.png"); diff --git a/code/resources.cpp b/code/resources.cpp index 8eb5b8b..59e95da 100644 --- a/code/resources.cpp +++ b/code/resources.cpp @@ -182,10 +182,10 @@ void loadFont() for (int i = 0 ; i < MAX_FONTSHAPES ; i++) { #if USEPACK - unpack("gfx/smallFont.bmp", PAK_FONT); + unpack("gfx/smallFont.png", PAK_FONT); image = IMG_Load_RW(engine.sdlrw, 1); #else - image = IMG_Load("gfx/smallFont.bmp"); + image = IMG_Load("gfx/smallFont.png"); #endif if (image == NULL) { diff --git a/code/title.cpp b/code/title.cpp index cd66413..7979f41 100644 --- a/code/title.cpp +++ b/code/title.cpp @@ -168,8 +168,8 @@ int doTitle() loadBackground("gfx/spirit.jpg"); SDL_Surface *prlogo, *sflogo; - prlogo = loadImage("gfx/prlogo.gif"); - sflogo = loadImage("gfx/sflogo.gif"); + prlogo = loadImage("gfx/prlogo.png"); + sflogo = loadImage("gfx/sflogo.png"); int prx = ((800 - prlogo->w) / 2); int pry = ((600 - prlogo->h) / 2); diff --git a/data/resources_all.dat b/data/resources_all.dat index f6b82ac..c9442ff 100644 --- a/data/resources_all.dat +++ b/data/resources_all.dat @@ -1,30 +1,30 @@ 0 gfx/plasmaGreen.png 1 gfx/plasmaRed.png -2 gfx/rocket1.bmp -3 gfx/rocket2.bmp -4 gfx/explode1.bmp -5 gfx/explode2.bmp -6 gfx/explode3.bmp -7 gfx/explode4.bmp +2 gfx/rocket1.png +3 gfx/rocket2.png +4 gfx/explode1.png +5 gfx/explode2.png +6 gfx/explode3.png +7 gfx/explode4.png 8 gfx/explode05.png 9 gfx/explode06.png 10 gfx/explode07.png 11 gfx/explode08.png -12 gfx/explode9.bmp -13 gfx/explode10.bmp -14 gfx/explode11.bmp -15 gfx/explode12.bmp -16 gfx/explode13.bmp -17 gfx/explode14.bmp -18 gfx/explode15.bmp -19 gfx/explode16.bmp +12 gfx/explode9.png +13 gfx/explode10.png +14 gfx/explode11.png +15 gfx/explode12.png +16 gfx/explode13.png +17 gfx/explode14.png +18 gfx/explode15.png +19 gfx/explode16.png 20 gfx/elec1.png 21 gfx/elec2.png 22 gfx/elec3.png 23 gfx/elec4.png -24 gfx/dollar.gif -25 gfx/rocket.gif -26 gfx/heart.gif +24 gfx/dollar.png +25 gfx/rocket.png +26 gfx/heart.png 27 gfx/plasmaAmmo.png 28 gfx/plasmaRate.png 29 gfx/plasmaDamage.png diff --git a/data/resources_sol.dat b/data/resources_sol.dat index 27c03c0..8b361e4 100644 --- a/data/resources_sol.dat +++ b/data/resources_sol.dat @@ -26,8 +26,8 @@ 27 gfx/merc2.png 30 gfx/escort1.png 31 gfx/escort2.png -32 gfx/barrier.gif -33 gfx/barrier.gif +32 gfx/barrier.png +33 gfx/barrier.png 34 gfx/mobileShield1.png 35 gfx/mobileShield2.png 36 gfx/drone1.png