walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove arrays with strings from defs.h. 

These are now put in the .cpp files where they are used.
This commit is contained in:
Guus Sliepen 2012-03-11 15:19:25 +01:00
parent a45df516df
commit f5eaa991cf
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/defs.h
View File

@ -300,15 +300,8 @@ enum {
PAK_S3M PAK_S3M
}; };
static const char systemNames[][15] = {"Spirit", "Eyananth", "Mordor", "Sol"}; extern const char *systemNames[];
static const char faces[][12] = { extern const char *systemBackground[];
"FACE_CHRIS", "FACE_SID", "FACE_KRASS",
"FACE_KLINE", "FACE_PHOEBE", "FACE_URSULA",
"FACE_CREW"};
static const char systemBackground[][20] = {
"gfx/spirit.jpg", "gfx/eyananth.jpg",
"gfx/mordor.jpg", "gfx/sol.jpg"};
static const signed char rate2reload[6] = {15, 15, 13, 11, 9, 7}; static const signed char rate2reload[6] = {15, 15, 13, 11, 9, 7};

9
code/intermission.cpp
View File

@ -20,6 +20,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "Starfighter.h" #include "Starfighter.h"
const char *systemNames[] = {"Spirit", "Eyananth", "Mordor", "Sol"};
const char *systemBackground[] = {
"gfx/spirit.jpg", "gfx/eyananth.jpg",
"gfx/mordor.jpg", "gfx/sol.jpg"
};
/* /*
Drives the cursor. Is used by some other screens too Drives the cursor. Is used by some other screens too
*/ */
@ -485,7 +492,7 @@ int galaxyMap()
loadMusic("music/3DParadise.mod"); loadMusic("music/3DParadise.mod");
loadBackground((char *)systemBackground[currentGame.system]); loadBackground(systemBackground[currentGame.system]);
char string[25]; char string[25];

2
code/resources.cpp
View File

@ -137,7 +137,7 @@ void loadGameGraphics()
fclose(fp); fclose(fp);
loadBackground((char *)systemBackground[currentGame.system]); loadBackground(systemBackground[currentGame.system]);
setAlienShapes(); setAlienShapes();