[Tux4kids-commits] r1444 - branches/commonification/tuxmath/trunk/src
Bolesław Kulbabiński
bolekk-guest at alioth.debian.org
Sun Aug 16 17:22:45 UTC 2009
Author: bolekk-guest
Date: 2009-08-16 17:22:45 +0000 (Sun, 16 Aug 2009)
New Revision: 1444
Added:
branches/commonification/tuxmath/trunk/src/fileops_media.h
Modified:
branches/commonification/tuxmath/trunk/src/credits.c
branches/commonification/tuxmath/trunk/src/factoroids.c
branches/commonification/tuxmath/trunk/src/fileops.h
branches/commonification/tuxmath/trunk/src/fileops_media.c
branches/commonification/tuxmath/trunk/src/game.c
branches/commonification/tuxmath/trunk/src/highscore.c
branches/commonification/tuxmath/trunk/src/setup.c
branches/commonification/tuxmath/trunk/src/titlescreen.c
Log:
created fileops_media.h header file in tuxmath and moved image names in there
Modified: branches/commonification/tuxmath/trunk/src/credits.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/credits.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/credits.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -26,6 +26,7 @@
#include "tuxmath.h"
#include "options.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "setup.h"
#include "credits.h"
#include "SDL_extras.h"
Modified: branches/commonification/tuxmath/trunk/src/factoroids.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/factoroids.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/factoroids.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -34,6 +34,7 @@
#include "game.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "setup.h"
#include "mathcards.h"
#include "loaders.h"
Modified: branches/commonification/tuxmath/trunk/src/fileops.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/fileops.h 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/fileops.h 2009-08-16 17:22:45 UTC (rev 1444)
@@ -26,144 +26,6 @@
GLOBAL_CONFIG_FILE
};
-/* Names for images (formerly in images.h) */
-enum {
- IMG_TITLE,
- IMG_LEFT,
- IMG_LEFT_GRAY,
- IMG_RIGHT,
- IMG_RIGHT_GRAY,
- IMG_TUX4KIDS,
- IMG_NBS,
- IMG_CITY_BLUE,
- IMG_CITY_BLUE_EXPL1,
- IMG_CITY_BLUE_EXPL2,
- IMG_CITY_BLUE_EXPL3,
- IMG_CITY_BLUE_EXPL4,
- IMG_CITY_BLUE_EXPL5,
- IMG_CITY_BLUE_DEAD,
- IMG_CITY_GREEN,
- IMG_CITY_GREEN_EXPL1,
- IMG_CITY_GREEN_EXPL2,
- IMG_CITY_GREEN_EXPL3,
- IMG_CITY_GREEN_EXPL4,
- IMG_CITY_GREEN_EXPL5,
- IMG_CITY_GREEN_DEAD,
- IMG_CITY_ORANGE,
- IMG_CITY_ORANGE_EXPL1,
- IMG_CITY_ORANGE_EXPL2,
- IMG_CITY_ORANGE_EXPL3,
- IMG_CITY_ORANGE_EXPL4,
- IMG_CITY_ORANGE_EXPL5,
- IMG_CITY_ORANGE_DEAD,
- IMG_CITY_RED,
- IMG_CITY_RED_EXPL1,
- IMG_CITY_RED_EXPL2,
- IMG_CITY_RED_EXPL3,
- IMG_CITY_RED_EXPL4,
- IMG_CITY_RED_EXPL5,
- IMG_CITY_RED_DEAD,
- IMG_SHIELDS,
- IMG_NUMS,
- IMG_LEDNUMS,
- IMG_LED_NEG_SIGN,
- IMG_PAUSED,
- IMG_DEMO,
- IMG_DEMO_SMALL,
- IMG_KEYPAD,
- IMG_KEYPAD_NO_NEG,
- IMG_CONSOLE_LED,
- IMG_CONSOLE_BASH,
- IMG_TUX_RELAX,
- IMG_TUX_ALARM,
- IMG_TUX_DRAT,
- IMG_TUX_YIPE,
- IMG_TUX_SIT,
- IMG_PENGUIN_FLAPDOWN,
- IMG_PENGUIN_FLAPUP,
- IMG_PENGUIN_INCOMING,
- IMG_PENGUIN_GRUMPY,
- IMG_PENGUIN_WORRIED,
- IMG_PENGUIN_STANDING_UP,
- IMG_PENGUIN_SITTING_DOWN,
- IMG_PENGUIN_WALK_ON1,
- IMG_PENGUIN_WALK_ON2,
- IMG_PENGUIN_WALK_ON3,
- IMG_PENGUIN_WALK_OFF1,
- IMG_PENGUIN_WALK_OFF2,
- IMG_PENGUIN_WALK_OFF3,
- IMG_IGLOO_MELTED3,
- IMG_IGLOO_MELTED2,
- IMG_IGLOO_MELTED1,
- IMG_IGLOO_HALF,
- IMG_IGLOO_INTACT,
- IMG_IGLOO_REBUILDING1,
- IMG_IGLOO_REBUILDING2,
- IMG_CLOUD,
- IMG_SNOW1,
- IMG_SNOW2,
- IMG_SNOW3,
- IMG_EXTRA_LIFE,
- IMG_WAVE,
- IMG_SCORE,
- IMG_STOP,
- IMG_NUMBERS,
- IMG_GAMEOVER,
- IMG_GAMEOVER_WON,
- BG_STARS,
- IMG_ASTEROID1,
- IMG_ASTEROID2,
- IMG_ASTEROID3,
- IMG_SHIP01,
- IMG_FACTOROIDS,
- IMG_FACTORS,
- IMG_TUX_LITTLE,
- IMG_GOOD,
- NUM_IMAGES
-};
-
-/* Names for animated images (sprites) */
-enum {
- ANIM_COMET,
- ANIM_BONUS_COMET,
- ANIM_COMET_EXPL,
- ANIM_BONUS_COMET_EXPL,
- ANIM_COMET_MINI,
- ANIM_TUX_CONSOLE,
- ANIM_TUX_EGYPT_LEFT,
- ANIM_TUX_EGYPT_RIGHT,
- ANIM_TUX_YAY,
- ANIM_TUX_YES,
- ANIM_TUX_FIST,
- ANIM_STEAM,
- NUM_SPRITES
-};
-
-/* Names for game sounds (formerly in sounds.h): */
-enum {
- SND_HARP,
- SND_POP,
- SND_TOCK,
- SND_LASER,
- SND_BUZZ,
- SND_ALARM,
- SND_SHIELDSDOWN,
- SND_EXPLOSION,
- SND_CLICK,
- SND_SIZZLE,
- SND_BONUS_COMET,
- SND_EXTRA_LIFE,
- NUM_SOUNDS
-};
-
-/* Names for background music (also formerly in sounds.h): */
-enum {
- MUS_GAME,
- MUS_GAME2,
- MUS_GAME3,
- NUM_MUSICS
-};
-
/* Names for game summary files: */
enum {
SUMMARY1,
@@ -202,13 +64,4 @@
/* These functions used by game() to record game summary: */
int write_pregame_summary(void);
int write_postgame_summary(void);
-
-int load_image_data();
-int SetImage(int id, SDL_Rect* rect);
-
-
-#ifndef NOSOUND
-int load_sound_data();
#endif
-
-#endif
Modified: branches/commonification/tuxmath/trunk/src/fileops_media.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/fileops_media.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/fileops_media.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -1,5 +1,5 @@
#include "tuxmath.h"
-#include "fileops.h"
+#include "fileops_media.h"
#include "loaders.h"
#include "options.h"
#include "SDL_extras.h"
@@ -118,7 +118,7 @@
"comets/bonus_comet",
"comets/cometex",
"comets/bonus_cometex",
- "comets/comet_mini",
+ "comets/mini_comet",
"tux/tux-console",
"tux/tux-egypt-left",
"tux/tux-egypt-right",
@@ -190,7 +190,16 @@
return 1;
}
+SDL_Surface* GetImage(int id)
+{
+ return images[id];
+}
+sprite* GetSprite(int id)
+{
+ return sprites[id];
+}
+
int SetImage(int id, SDL_Rect* rect)
{
if(images[id])
Added: branches/commonification/tuxmath/trunk/src/fileops_media.h
===================================================================
--- branches/commonification/tuxmath/trunk/src/fileops_media.h (rev 0)
+++ branches/commonification/tuxmath/trunk/src/fileops_media.h 2009-08-16 17:22:45 UTC (rev 1444)
@@ -0,0 +1,156 @@
+#ifndef FILEOPS_MEDIA_H
+#define FILEOPS_MEDIA_H
+
+#include "globals.h"
+#include "SDL.h"
+
+/* Names for images (formerly in images.h) */
+enum {
+ IMG_TITLE,
+ IMG_LEFT,
+ IMG_LEFT_GRAY,
+ IMG_RIGHT,
+ IMG_RIGHT_GRAY,
+ IMG_TUX4KIDS,
+ IMG_NBS,
+ IMG_CITY_BLUE,
+ IMG_CITY_BLUE_EXPL1,
+ IMG_CITY_BLUE_EXPL2,
+ IMG_CITY_BLUE_EXPL3,
+ IMG_CITY_BLUE_EXPL4,
+ IMG_CITY_BLUE_EXPL5,
+ IMG_CITY_BLUE_DEAD,
+ IMG_CITY_GREEN,
+ IMG_CITY_GREEN_EXPL1,
+ IMG_CITY_GREEN_EXPL2,
+ IMG_CITY_GREEN_EXPL3,
+ IMG_CITY_GREEN_EXPL4,
+ IMG_CITY_GREEN_EXPL5,
+ IMG_CITY_GREEN_DEAD,
+ IMG_CITY_ORANGE,
+ IMG_CITY_ORANGE_EXPL1,
+ IMG_CITY_ORANGE_EXPL2,
+ IMG_CITY_ORANGE_EXPL3,
+ IMG_CITY_ORANGE_EXPL4,
+ IMG_CITY_ORANGE_EXPL5,
+ IMG_CITY_ORANGE_DEAD,
+ IMG_CITY_RED,
+ IMG_CITY_RED_EXPL1,
+ IMG_CITY_RED_EXPL2,
+ IMG_CITY_RED_EXPL3,
+ IMG_CITY_RED_EXPL4,
+ IMG_CITY_RED_EXPL5,
+ IMG_CITY_RED_DEAD,
+ IMG_SHIELDS,
+ IMG_NUMS,
+ IMG_LEDNUMS,
+ IMG_LED_NEG_SIGN,
+ IMG_PAUSED,
+ IMG_DEMO,
+ IMG_DEMO_SMALL,
+ IMG_KEYPAD,
+ IMG_KEYPAD_NO_NEG,
+ IMG_CONSOLE_LED,
+ IMG_CONSOLE_BASH,
+ IMG_TUX_RELAX,
+ IMG_TUX_ALARM,
+ IMG_TUX_DRAT,
+ IMG_TUX_YIPE,
+ IMG_TUX_SIT,
+ IMG_PENGUIN_FLAPDOWN,
+ IMG_PENGUIN_FLAPUP,
+ IMG_PENGUIN_INCOMING,
+ IMG_PENGUIN_GRUMPY,
+ IMG_PENGUIN_WORRIED,
+ IMG_PENGUIN_STANDING_UP,
+ IMG_PENGUIN_SITTING_DOWN,
+ IMG_PENGUIN_WALK_ON1,
+ IMG_PENGUIN_WALK_ON2,
+ IMG_PENGUIN_WALK_ON3,
+ IMG_PENGUIN_WALK_OFF1,
+ IMG_PENGUIN_WALK_OFF2,
+ IMG_PENGUIN_WALK_OFF3,
+ IMG_IGLOO_MELTED3,
+ IMG_IGLOO_MELTED2,
+ IMG_IGLOO_MELTED1,
+ IMG_IGLOO_HALF,
+ IMG_IGLOO_INTACT,
+ IMG_IGLOO_REBUILDING1,
+ IMG_IGLOO_REBUILDING2,
+ IMG_CLOUD,
+ IMG_SNOW1,
+ IMG_SNOW2,
+ IMG_SNOW3,
+ IMG_EXTRA_LIFE,
+ IMG_WAVE,
+ IMG_SCORE,
+ IMG_STOP,
+ IMG_NUMBERS,
+ IMG_GAMEOVER,
+ IMG_GAMEOVER_WON,
+ BG_STARS,
+ IMG_ASTEROID1,
+ IMG_ASTEROID2,
+ IMG_ASTEROID3,
+ IMG_SHIP01,
+ IMG_FACTOROIDS,
+ IMG_FACTORS,
+ IMG_TUX_LITTLE,
+ IMG_GOOD,
+ NUM_IMAGES
+};
+
+/* Names for animated images (sprites) */
+enum {
+ ANIM_COMET,
+ ANIM_BONUS_COMET,
+ ANIM_COMET_EXPL,
+ ANIM_BONUS_COMET_EXPL,
+ ANIM_COMET_MINI,
+ ANIM_TUX_CONSOLE,
+ ANIM_TUX_EGYPT_LEFT,
+ ANIM_TUX_EGYPT_RIGHT,
+ ANIM_TUX_YAY,
+ ANIM_TUX_YES,
+ ANIM_TUX_FIST,
+ ANIM_STEAM,
+ NUM_SPRITES
+};
+
+/* Names for game sounds (formerly in sounds.h): */
+enum {
+ SND_HARP,
+ SND_POP,
+ SND_TOCK,
+ SND_LASER,
+ SND_BUZZ,
+ SND_ALARM,
+ SND_SHIELDSDOWN,
+ SND_EXPLOSION,
+ SND_CLICK,
+ SND_SIZZLE,
+ SND_BONUS_COMET,
+ SND_EXTRA_LIFE,
+ NUM_SOUNDS
+};
+
+/* Names for background music (also formerly in sounds.h): */
+enum {
+ MUS_GAME,
+ MUS_GAME2,
+ MUS_GAME3,
+ NUM_MUSICS
+};
+
+
+int load_image_data();
+int SetImage(int id, SDL_Rect* rect);
+SDL_Surface* GetImage(int id);
+sprite* GetSprite(int id);
+
+#ifndef NOSOUND
+int load_sound_data();
+#endif
+
+
+#endif
Modified: branches/commonification/tuxmath/trunk/src/game.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/game.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/game.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -33,6 +33,7 @@
#include "game.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "setup.h"
#include "loaders.h"
#include "mathcards.h"
@@ -67,12 +68,12 @@
#define POSITIONED_IMAGES 2
const int img_ids[POSITIONED_IMAGES] = {
IMG_CONSOLE_LED,
- IMG_CONSOLE_BASH,
+ IMG_CONSOLE_BASH
};
const float img_pos[POSITIONED_IMAGES][4] = {
{0.4, 0.8, 0.2, 0.2},
- {0.4, 0.8, 0.2, 0.2},
+ {0.4, 0.8, 0.2, 0.2}
};
#define CONSOLE_BORDER 0.036
Modified: branches/commonification/tuxmath/trunk/src/highscore.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/highscore.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/highscore.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -16,6 +16,7 @@
#include "menu.h"
#include "titlescreen.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "setup.h"
#include "options.h"
#include "SDL_extras.h"
Modified: branches/commonification/tuxmath/trunk/src/setup.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/setup.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/setup.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -43,6 +43,7 @@
#include "mathcards.h"
#include "setup.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "loaders.h"
#include "game.h"
#include "menu.h"
Modified: branches/commonification/tuxmath/trunk/src/titlescreen.c
===================================================================
--- branches/commonification/tuxmath/trunk/src/titlescreen.c 2009-08-16 15:18:44 UTC (rev 1443)
+++ branches/commonification/tuxmath/trunk/src/titlescreen.c 2009-08-16 17:22:45 UTC (rev 1444)
@@ -32,6 +32,7 @@
#include "mathcards.h"
#include "campaign.h"
#include "fileops.h"
+#include "fileops_media.h"
#include "setup.h"
#include "loaders.h"
#include "SDL_extras.h"
@@ -53,7 +54,6 @@
X( RUN_CAMPAIGN ),\
X( RUN_ARCADE ),\
X( RUN_CUSTOM ),\
- X( RUN_MAIN_MENU ),\
X( RUN_LAN_HOST ),\
X( RUN_LAN_JOIN ),\
X( RUN_SCORE_SWEEP ),\
More information about the Tux4kids-commits
mailing list