[Tux4kids-commits] r1363 - branches/commonification/tuxtype/trunk/src
Bolesław Kulbabiński
bolekk-guest at alioth.debian.org
Tue Aug 4 23:39:54 UTC 2009
Author: bolekk-guest
Date: 2009-08-04 23:39:54 +0000 (Tue, 04 Aug 2009)
New Revision: 1363
Modified:
branches/commonification/tuxtype/trunk/src/SDL_extras.h
branches/commonification/tuxtype/trunk/src/alphabet.c
branches/commonification/tuxtype/trunk/src/audio.c
branches/commonification/tuxtype/trunk/src/funcs.h
branches/commonification/tuxtype/trunk/src/globals.h
branches/commonification/tuxtype/trunk/src/laser.c
branches/commonification/tuxtype/trunk/src/laser.h
branches/commonification/tuxtype/trunk/src/loaders.c
branches/commonification/tuxtype/trunk/src/pause.c
branches/commonification/tuxtype/trunk/src/playgame.c
branches/commonification/tuxtype/trunk/src/practice.c
branches/commonification/tuxtype/trunk/src/scripting.c
branches/commonification/tuxtype/trunk/src/theme.c
branches/commonification/tuxtype/trunk/src/titlescreen.c
Log:
added workaround functions for loading data files to be compatible with t4kcommon
Modified: branches/commonification/tuxtype/trunk/src/SDL_extras.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/SDL_extras.h 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/SDL_extras.h 2009-08-04 23:39:54 UTC (rev 1363)
@@ -19,7 +19,7 @@
#include "SDL.h"
#ifdef HAVE_LIBT4KCOMMON
-#include "t4kcommon.h"
+//#include <t4kcommon/tux4kids-common.h>
#else
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
#define rmask 0xff000000
Modified: branches/commonification/tuxtype/trunk/src/alphabet.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/alphabet.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/alphabet.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -288,7 +288,7 @@
buf = "";
return;
}
- sprintf(buf,"keyboard/keyboard_%s.png", keyboard_list[index].keyname);
+ sprintf(buf,"/images/keyboard/keyboard_%s.png", keyboard_list[index].keyname);
}
@@ -300,7 +300,7 @@
buf = "";
return;
}
- sprintf(buf,"keyboard/keyboardN_%s.png", keyboard_list[index].keyname);
+ sprintf(buf,"/images/keyboard/keyboardN_%s.png", keyboard_list[index].keyname);
}
@@ -314,11 +314,11 @@
}
if(keyboard_list[index].shift == 0)
- sprintf(buf,"keyboard/keyboard_None.png");
+ sprintf(buf,"/images/keyboard/keyboard_None.png");
else if(keyboard_list[index].shift == 1)
- sprintf(buf,"keyboard/keyboard_D00.png");
+ sprintf(buf,"/images/keyboard/keyboard_D00.png");
else
- sprintf(buf,"keyboard/keyboard_D12.png");
+ sprintf(buf,"/images/keyboard/keyboard_D12.png");
}
Modified: branches/commonification/tuxtype/trunk/src/audio.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/audio.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/audio.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -41,7 +41,7 @@
if (!settings.sys_sound) return;
if (!musicFilename) return;
- tmp_music = LoadMusic(musicFilename);
+ tmp_music = LoadMusicNoPrefix(musicFilename);
if (tmp_music)
{
Modified: branches/commonification/tuxtype/trunk/src/funcs.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/funcs.h 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/funcs.h 2009-08-04 23:39:54 UTC (rev 1363)
@@ -76,6 +76,11 @@
#define IMG_NOT_REQUIRED 0x10
#define IMG_NO_PNG_FALLBACK 0x20
+SDL_Surface* LoadImageNoPrefix(const char* file_name, int mode);
+sprite* LoadSpriteNoPrefix(const char* file_name, int mode);
+Mix_Chunk* LoadSoundNoPrefix( char *datafile);
+Mix_Music* LoadMusicNoPrefix(char *datafile);
+
#ifndef HAVE_LIBT4KCOMMON
int LoadBothBkgds(const char* datafile);
SDL_Surface* CurrentBkgd(void);
Modified: branches/commonification/tuxtype/trunk/src/globals.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/globals.h 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/globals.h 2009-08-04 23:39:54 UTC (rev 1363)
@@ -54,6 +54,8 @@
//#include <t4kcommon/tux4kids-common.h>
#endif
+typedef enum { false, true } bool;
+
// Translation stuff:
#include "gettext.h"
#include <locale.h>
@@ -62,7 +64,6 @@
#define _(String) gettext (String)
#define gettext_noop(String) String
#define N_(String) gettext_noop (String)
-typedef enum { false, true } bool;
/* FIXME don't think this is needed (done elsewhere) */
#ifdef WIN32
Modified: branches/commonification/tuxtype/trunk/src/laser.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/laser.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/laser.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -709,15 +709,15 @@
/* Load images: */
for (i = 0; i < NUM_IMAGES; i++)
- images[i] = LoadImage(image_filenames[i], IMG_ALPHA);
- shield = LoadSprite( "cities/shield", IMG_ALPHA );
+ images[i] = LoadImageNoPrefix(image_filenames[i], IMG_ALPHA);
+ shield = LoadSpriteNoPrefix( "/images/cities/shield", IMG_ALPHA );
if (settings.sys_sound) {
for (i = 0; i < NUM_SOUNDS; i++)
- sounds[i] = LoadSound(sound_filenames[i]);
+ sounds[i] = LoadSoundNoPrefix(sound_filenames[i]);
for (i = 0; i < NUM_MUSICS; i++)
- musics[i] = LoadMusic(music_filenames[i]);
+ musics[i] = LoadMusicNoPrefix(music_filenames[i]);
}
// PauseLoadMedia();
@@ -771,7 +771,7 @@
DOUT(i);
- sprintf(fname, "backgrounds/%d.jpg", i);
+ sprintf(fname, "/images/backgrounds/%d.jpg", i);
DEBUGCODE { fprintf(stderr, "Will try to load file:\t%s", fname); }
Modified: branches/commonification/tuxtype/trunk/src/laser.h
===================================================================
--- branches/commonification/tuxtype/trunk/src/laser.h 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/laser.h 2009-08-04 23:39:54 UTC (rev 1363)
@@ -91,62 +91,62 @@
static char* image_filenames[NUM_IMAGES] = {
- "status/tux_helmet1.png",
- "status/tux_helmet2.png",
- "status/tux_helmet3.png",
- "cities/city-blue.png",
- "cities/csplode-blue-1.png",
- "cities/csplode-blue-2.png",
- "cities/csplode-blue-3.png",
- "cities/csplode-blue-4.png",
- "cities/csplode-blue-5.png",
- "cities/cdead-blue.png",
- "cities/city-green.png",
- "cities/csplode-green-1.png",
- "cities/csplode-green-2.png",
- "cities/csplode-green-3.png",
- "cities/csplode-green-4.png",
- "cities/csplode-green-5.png",
- "cities/cdead-green.png",
- "cities/city-orange.png",
- "cities/csplode-orange-1.png",
- "cities/csplode-orange-2.png",
- "cities/csplode-orange-3.png",
- "cities/csplode-orange-4.png",
- "cities/csplode-orange-5.png",
- "cities/cdead-orange.png",
- "cities/city-red.png",
- "cities/csplode-red-1.png",
- "cities/csplode-red-2.png",
- "cities/csplode-red-3.png",
- "cities/csplode-red-4.png",
- "cities/csplode-red-5.png",
- "cities/cdead-red.png",
- "comets/comet1.png",
- "comets/comet2.png",
- "comets/comet3.png",
- "comets/cometex1.png",
- "comets/cometex2.png",
- "tux/console.png",
- "tux/tux-console1.png",
- "tux/tux-console2.png",
- "tux/tux-console3.png",
- "tux/tux-console4.png",
- "tux/tux-relax1.png",
- "tux/tux-relax2.png",
- "tux/tux-drat.png",
- "tux/tux-yipe.png",
- "tux/tux-yay1.png",
- "tux/tux-yay2.png",
- "tux/tux-yes1.png",
- "tux/tux-yes2.png",
- "tux/tux-sit.png",
- "tux/tux-fist0.png",
- "tux/tux-fist1.png",
- "status/wave.png",
- "status/score.png",
- "status/numbers.png",
- "status/gameover.png"
+ "/images/status/tux_helmet1.png",
+ "/images/status/tux_helmet2.png",
+ "/images/status/tux_helmet3.png",
+ "/images/cities/city-blue.png",
+ "/images/cities/csplode-blue-1.png",
+ "/images/cities/csplode-blue-2.png",
+ "/images/cities/csplode-blue-3.png",
+ "/images/cities/csplode-blue-4.png",
+ "/images/cities/csplode-blue-5.png",
+ "/images/cities/cdead-blue.png",
+ "/images/cities/city-green.png",
+ "/images/cities/csplode-green-1.png",
+ "/images/cities/csplode-green-2.png",
+ "/images/cities/csplode-green-3.png",
+ "/images/cities/csplode-green-4.png",
+ "/images/cities/csplode-green-5.png",
+ "/images/cities/cdead-green.png",
+ "/images/cities/city-orange.png",
+ "/images/cities/csplode-orange-1.png",
+ "/images/cities/csplode-orange-2.png",
+ "/images/cities/csplode-orange-3.png",
+ "/images/cities/csplode-orange-4.png",
+ "/images/cities/csplode-orange-5.png",
+ "/images/cities/cdead-orange.png",
+ "/images/cities/city-red.png",
+ "/images/cities/csplode-red-1.png",
+ "/images/cities/csplode-red-2.png",
+ "/images/cities/csplode-red-3.png",
+ "/images/cities/csplode-red-4.png",
+ "/images/cities/csplode-red-5.png",
+ "/images/cities/cdead-red.png",
+ "/images/comets/comet1.png",
+ "/images/comets/comet2.png",
+ "/images/comets/comet3.png",
+ "/images/comets/cometex1.png",
+ "/images/comets/cometex2.png",
+ "/images/tux/console.png",
+ "/images/tux/tux-console1.png",
+ "/images/tux/tux-console2.png",
+ "/images/tux/tux-console3.png",
+ "/images/tux/tux-console4.png",
+ "/images/tux/tux-relax1.png",
+ "/images/tux/tux-relax2.png",
+ "/images/tux/tux-drat.png",
+ "/images/tux/tux-yipe.png",
+ "/images/tux/tux-yay1.png",
+ "/images/tux/tux-yay2.png",
+ "/images/tux/tux-yes1.png",
+ "/images/tux/tux-yes2.png",
+ "/images/tux/tux-sit.png",
+ "/images/tux/tux-fist0.png",
+ "/images/tux/tux-fist1.png",
+ "/images/status/wave.png",
+ "/images/status/score.png",
+ "/images/status/numbers.png",
+ "/images/status/gameover.png"
};
enum {
@@ -162,13 +162,13 @@
static char* sound_filenames[NUM_SOUNDS] = {
- "pop.wav",
- "laser.wav",
- "buzz.wav",
- "alarm.wav",
- "shieldsdown.wav",
- "explosion.wav",
- "click.wav"
+ "/sounds/pop.wav",
+ "/sounds/laser.wav",
+ "/sounds/buzz.wav",
+ "/sounds/alarm.wav",
+ "/sounds/shieldsdown.wav",
+ "/sounds/explosion.wav",
+ "/sounds/click.wav"
};
@@ -180,9 +180,9 @@
};
static char * music_filenames[NUM_MUSICS] = {
- "game.mod",
- "game2.mod",
- "game3.mod"
+ "/sounds/game.mod",
+ "/sounds/game2.mod",
+ "/sounds/game3.mod"
};
#endif
Modified: branches/commonification/tuxtype/trunk/src/loaders.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/loaders.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/loaders.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -46,7 +46,106 @@
static SDL_Surface* win_bkgd = NULL;
static SDL_Surface* fullscr_bkgd = NULL;
+/* FIXME: these functions are just ugly workarounds for loading images without
+ given data prefix. Data Prefixes are handled differently in TuxType and TuxMath,
+ and it should be unified. */
+char* GetFullPath(const char* file)
+{
+ char* path;
+
+ if(NULL == file)
+ return NULL;
+
+ path = (char*) malloc(PATH_MAX * sizeof(char));
+
+ if(!settings.use_english)
+ {
+ sprintf(path, "%s%s", settings.theme_data_path, file);
+ if(CheckFile(path))
+ return path;
+ }
+
+ sprintf(path, "%s%s", settings.default_data_path, file);
+ return path;
+}
+
+char* GetSpriteFullPath(const char* file)
+{
+ char* path;
+
+ if(NULL == file)
+ return NULL;
+
+ path = (char*) malloc(PATH_MAX * sizeof(char));
+
+ if(!settings.use_english)
+ {
+ sprintf(path, "%s%s.svg", settings.theme_data_path, file);
+ if(CheckFile(path))
+ return path;
+ sprintf(path, "%s%s0.png", settings.theme_data_path, file);
+ if(CheckFile(path))
+ return path;
+ }
+
+ sprintf(path, "%s%s", settings.default_data_path, file);
+ return path;
+}
+
+SDL_Surface* LoadImageNoPrefix(const char* file_name, int mode)
+{
+ char* path = GetFullPath(file_name);
+ SDL_Surface* surf = NULL;
+
+ if(path)
+ {
+ surf = LoadImage(path, mode);
+ free(path);
+ }
+ return surf;
+}
+
+sprite* LoadSpriteNoPrefix(const char* file_name, int mode)
+{
+ char* path = GetSpriteFullPath(file_name);
+ sprite* surf = NULL;
+
+ if(path)
+ {
+ surf = LoadSprite(path, mode);
+ free(path);
+ }
+ return surf;
+}
+
+Mix_Chunk* LoadSoundNoPrefix( char *datafile)
+{
+ char* path = GetFullPath(datafile);
+ Mix_Chunk* surf = NULL;
+
+ if(path)
+ {
+ surf = LoadSound(path);
+ free(path);
+ }
+ return surf;
+}
+
+Mix_Music* LoadMusicNoPrefix(char *datafile)
+{
+ char* path = GetFullPath(datafile);
+ Mix_Music* surf = NULL;
+
+ if(path)
+ {
+ surf = LoadMusic(path);
+ free(path);
+ }
+ return surf;
+}
+
+
/* FIXME not sure we need to call *textdomain() functions again here */
/* FIXME need to read language's font name, if needed - e.g. Russian. */
/* also should have return value reflect success or failure. */
@@ -105,7 +204,7 @@
LOG("Entering LoadBothBkgds()\n");
- orig = LoadImage(datafile, IMG_REGULAR);
+ orig = LoadImageNoPrefix(datafile, IMG_REGULAR);
DEBUGCODE
{
@@ -165,6 +264,8 @@
fullscr_bkgd = NULL;
}
+#ifndef HAVE_LIBT4KCOMMON
+
int CheckFile(const char* file)
{
FILE* fp = NULL;
@@ -398,7 +499,7 @@
/* run loader depending on file extension */
/* add path prefix */
- snprintf(fn, PATH_MAX, "%s/images/%s", settings.default_data_path, file_name);
+ snprintf(fn, PATH_MAX, "%s", file_name);
fn_len = strlen(fn);
if(strcmp(fn + fn_len - 4, ".svg"))
@@ -700,36 +801,19 @@
s->cur = (s->cur + 1) % s->num_frames;
}
-
-
-/***************************
- LoadSound : Load a sound/music patch from a file.
-****************************/
-Mix_Chunk* LoadSound(char* datafile )
-{
+/* LoadSound : Load a sound/music patch from a file. */
+Mix_Chunk* LoadSound( char *datafile )
+{
Mix_Chunk* tempChunk = NULL;
- char fn[FNLEN];
+ char fn[PATH_MAX];
- /* First look under theme path if desired: */
- if (!settings.use_english)
- {
- sprintf(fn , "%s/sounds/%s", settings.theme_data_path, datafile);
- tempChunk = Mix_LoadWAV(fn);
- if (tempChunk)
- return tempChunk;
- }
-
- /* If nothing loaded yet, try default path: */
+ sprintf(fn , "%s", datafile);
+ tempChunk = Mix_LoadWAV(fn);
if (!tempChunk)
{
- sprintf(fn , "%s/sounds/%s", settings.default_data_path, datafile);
- tempChunk = Mix_LoadWAV(fn);
- if (tempChunk)
- return tempChunk;
+ fprintf(stderr, "LoadSound(): %s not found\n\n", fn);
}
- // We never want to get here...
- fprintf(stderr, "LoadSound() - could not load %s\n", datafile);
- return NULL;
+ return tempChunk;
}
/* LoadMusic : Load music from a datafile */
@@ -755,3 +839,4 @@
return tempMusic;
}
+#endif //HAVE_LIBT4KCOMMON
Modified: branches/commonification/tuxtype/trunk/src/pause.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/pause.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/pause.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -208,18 +208,18 @@
static void pause_load_media(void) {
if (settings.sys_sound)
- pause_sfx = LoadSound( "tock.wav" );
+ pause_sfx = LoadSoundNoPrefix( "/sounds/tock.wav" );
- up = LoadImage("up.png", IMG_ALPHA);
+ up = LoadImageNoPrefix("/images/up.png", IMG_ALPHA);
rectUp.w = up->w; rectUp.h = up->h;
- down = LoadImage("down.png", IMG_ALPHA);
+ down = LoadImageNoPrefix("/images/down.png", IMG_ALPHA);
rectDown.w = down->w; rectDown.h = down->h;
- left = LoadImage("left.png", IMG_ALPHA);
+ left = LoadImageNoPrefix("/images/left.png", IMG_ALPHA);
rectLeft.w = left->w; rectLeft.h = left->h;
- right = LoadImage("right.png", IMG_ALPHA);
+ right = LoadImageNoPrefix("/images/right.png", IMG_ALPHA);
rectRight.w = right->w; rectRight.h = right->h;
// f1 = LoadFont(settings.theme_font_name, 24);
Modified: branches/commonification/tuxtype/trunk/src/playgame.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/playgame.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/playgame.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -190,14 +190,14 @@
}
if (diflevel == INF_PRACT)
- sprintf(filename, "pract.png");
+ sprintf(filename, "/images/pract.png");
else
- sprintf(filename, "kcas%i_%i.jpg", diflevel+1, curlevel+1);
+ sprintf(filename, "/images/kcas%i_%i.jpg", diflevel+1, curlevel+1);
/* --- Special Hidden Code --- */
if (settings.hidden && curlevel == 3)
- sprintf(filename, "hidden.jpg");
+ sprintf(filename, "/images/hidden.jpg");
DEBUGCODE
{
@@ -212,7 +212,7 @@
if (settings.sys_sound)
{
- sprintf(filename, "kmus%i.wav", curlevel + 1);
+ sprintf(filename, "/sounds/kmus%i.wav", curlevel + 1);
AudioMusicLoad( filename, -1 );
}
@@ -630,8 +630,8 @@
number_max_w = 0;
for (i = 0; i < NUM_NUMS; i++) {
- sprintf(filename, "num_%i.png", i);
- number[i] = LoadImage( filename, IMG_COLORKEY );
+ sprintf(filename, "/images/num_%i.png", i);
+ number[i] = LoadImageNoPrefix(filename, IMG_COLORKEY );
if (number[i]->w > number_max_w)
number_max_w = number[i]->w;
}
@@ -647,13 +647,13 @@
if (settings.sys_sound) {
LOG( "=Loading Sound FX\n" );
- sound[WIN_WAV] = LoadSound( "win.wav" );
- sound[WINFINAL_WAV] = LoadSound( "winfinal.wav" );
- sound[BITE_WAV] = LoadSound( "bite.wav" );
- sound[LOSE_WAV] = LoadSound( "lose.wav" );
- sound[RUN_WAV] = LoadSound( "run.wav" );
- sound[SPLAT_WAV] = LoadSound( "splat.wav" );
- sound[EXCUSEME_WAV] = LoadSound( "excuseme.wav" );
+ sound[WIN_WAV] = LoadSoundNoPrefix( "/sounds/win.wav" );
+ sound[WINFINAL_WAV] = LoadSoundNoPrefix( "/sounds/winfinal.wav" );
+ sound[BITE_WAV] = LoadSoundNoPrefix( "/sounds/bite.wav" );
+ sound[LOSE_WAV] = LoadSoundNoPrefix( "/sounds/lose.wav" );
+ sound[RUN_WAV] = LoadSoundNoPrefix( "/sounds/run.wav" );
+ sound[SPLAT_WAV] = LoadSoundNoPrefix( "/sounds/splat.wav" );
+ sound[EXCUSEME_WAV] = LoadSoundNoPrefix( "/sounds/excuseme.wav" );
LOG( "=Done Loading Sound FX\n" );
} else
@@ -702,8 +702,8 @@
LOG( "=LoadFishies()\n" );
- fish_sprite = LoadSprite( "fishy", IMG_COLORKEY );
- splat_sprite = LoadSprite( "splat", IMG_COLORKEY );
+ fish_sprite = LoadSpriteNoPrefix( "/images/fishy", IMG_COLORKEY );
+ splat_sprite = LoadSpriteNoPrefix( "/images/splat", IMG_COLORKEY );
for (i = 0; i < MAX_FISHIES_HARD; i++) {
fish_object[i].alive = 1;
@@ -725,7 +725,7 @@
LOG( "=LoadTuxAnims(): Loading Tux Animations\n" );
for ( i=0; i < TUX_NUM_STATES; i++ ) {
- tux_object.spr[i][RIGHT] = LoadSprite( tux_sprite_fns[i], IMG_COLORKEY );
+ tux_object.spr[i][RIGHT] = LoadSpriteNoPrefix( tux_sprite_fns[i], IMG_COLORKEY );
tux_object.spr[i][LEFT] = FlipSprite( tux_object.spr[i][RIGHT], 1, 0 );
}
Modified: branches/commonification/tuxtype/trunk/src/practice.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/practice.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/practice.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -858,27 +858,27 @@
/* load needed SDL_Surfaces: */
- LoadBothBkgds("main_bkg.png");
- hands = LoadImage("hands/hands.png", IMG_ALPHA);
- hand_shift[0] = LoadImage("hands/none.png", IMG_ALPHA);
- hand_shift[1] = LoadImage("hands/lshift.png", IMG_ALPHA);
- hand_shift[2] = LoadImage("hands/rshift.png", IMG_ALPHA);
- keyboard = LoadImage("keyboard/keyboard.png", IMG_ALPHA);
+ LoadBothBkgds("/images/main_bkg.png");
+ hands = LoadImageNoPrefix("/images/hands/hands.png", IMG_ALPHA);
+ hand_shift[0] = LoadImageNoPrefix("/images/hands/none.png", IMG_ALPHA);
+ hand_shift[1] = LoadImageNoPrefix("/images/hands/lshift.png", IMG_ALPHA);
+ hand_shift[2] = LoadImageNoPrefix("/images/hands/rshift.png", IMG_ALPHA);
+ keyboard = LoadImageNoPrefix("/images/keyboard/keyboard.png", IMG_ALPHA);
for (i = 0; i < 10; i++)
{
- sprintf(fn, "hands/%d.png", i);
- hand[i] = LoadImage(fn, IMG_ALPHA);
+ sprintf(fn, "/images/hands/%d.png", i);
+ hand[i] = LoadImageNoPrefix(fn, IMG_ALPHA);
if (!hand[i])
load_failed = 1;
}
/* load tux sprites: */
- tux_win = LoadSprite("tux/win", IMG_COLORKEY);
- tux_stand = LoadSprite("tux/stand", IMG_COLORKEY);
+ tux_win = LoadSpriteNoPrefix("/images/tux/win", IMG_COLORKEY);
+ tux_stand = LoadSpriteNoPrefix("/images/tux/stand", IMG_COLORKEY);
/* load needed sounds: */
- wrong = LoadSound("buzz.wav");
- cheer = LoadSound("cheer.wav");
+ wrong = LoadSoundNoPrefix("/sounds/buzz.wav");
+ cheer = LoadSoundNoPrefix("/sounds/cheer.wav");
/* load needed fonts: */
calc_font_sizes();
@@ -1406,7 +1406,7 @@
{
char buf[50];
GetKeyPos(index,buf);
- return (LoadImage(buf, IMG_ALPHA));
+ return (LoadImageNoPrefix(buf, IMG_ALPHA));
}
@@ -1414,7 +1414,7 @@
{
char buf[50];
GetWrongKeyPos(index,buf);
- return (LoadImage(buf, IMG_ALPHA));
+ return (LoadImageNoPrefix(buf, IMG_ALPHA));
}
@@ -1423,7 +1423,7 @@
char buf[50];
GetKeyShift(index, buf);
- return (LoadImage(buf, IMG_ALPHA));
+ return (LoadImageNoPrefix(buf, IMG_ALPHA));
}
static int create_labels(void)
@@ -1461,4 +1461,4 @@
return 1;
else
return 0;
-}
\ No newline at end of file
+}
Modified: branches/commonification/tuxtype/trunk/src/scripting.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/scripting.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/scripting.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -218,9 +218,9 @@
select[i] = BlackOutline( script_filenames[i], DEFAULT_MENU_FONT_SIZE, &yellow);
}
- left = LoadImage("left.png", IMG_ALPHA);
- right = LoadImage("right.png", IMG_ALPHA);
- LoadBothBkgds("main_bkg.png");
+ left = LoadImageNoPrefix("/images/left.png", IMG_ALPHA);
+ right = LoadImageNoPrefix("/images/right.png", IMG_ALPHA);
+ LoadBothBkgds("/images/main_bkg.png");
/* Get out if needed surface not loaded successfully: */
if (!CurrentBkgd() || !left || !right)
@@ -964,13 +964,13 @@
/* --- setup background image --- */
if (curPage->background)
{
- SDL_Surface* img = LoadImage(curPage->background, IMG_ALPHA|IMG_NOT_REQUIRED);
+ SDL_Surface* img = LoadImageNoPrefix(curPage->background, IMG_ALPHA|IMG_NOT_REQUIRED);
SDL_BlitSurface(img, NULL, screen, NULL);
SDL_FreeSurface(img);
}
else if (curScript->background)
{
- SDL_Surface* img = LoadImage(curScript->background, IMG_ALPHA|IMG_NOT_REQUIRED);
+ SDL_Surface* img = LoadImageNoPrefix(curScript->background, IMG_ALPHA|IMG_NOT_REQUIRED);
SDL_BlitSurface(img, NULL, screen, NULL);
SDL_FreeSurface(img);
}
@@ -982,7 +982,7 @@
{
case itemIMG:
{
- SDL_Surface* img = LoadImage(curItem->data, IMG_ALPHA|IMG_NOT_REQUIRED);
+ SDL_Surface* img = LoadImageNoPrefix(curItem->data, IMG_ALPHA|IMG_NOT_REQUIRED);
if (img)
{
/* --- figure out where to put it! --- */
@@ -1029,7 +1029,7 @@
if (curItem->onclick)
{
if (settings.sys_sound)
- clickWavs[numClicks] = LoadSound(curItem->onclick);
+ clickWavs[numClicks] = LoadSoundNoPrefix(curItem->onclick);
clickRects[numClicks].x = loc.x;
clickRects[numClicks].y = loc.y;
clickRects[numClicks].w = loc.w;
@@ -1141,7 +1141,7 @@
case itemWAV:
{
// HACK, we need to make sure no more than 8 sounds or so..
- sounds[numWavs] = LoadSound( curItem->data );
+ sounds[numWavs] = LoadSoundNoPrefix( curItem->data );
Mix_PlayChannel( numWavs, sounds[numWavs], -curItem->loop );
numWavs++;
break;
Modified: branches/commonification/tuxtype/trunk/src/theme.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/theme.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/theme.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -105,11 +105,11 @@
select[i] = BlackOutline( themeNames[i], DEFAULT_MENU_FONT_SIZE, &yellow);
}
- LoadBothBkgds("main_bkg.png");
+ LoadBothBkgds("/images/main_bkg.png");
- world = LoadImage("world.png", IMG_ALPHA);
- left = LoadImage("left.png", IMG_ALPHA);
- right = LoadImage("right.png", IMG_ALPHA);
+ world = LoadImageNoPrefix("/images/world.png", IMG_ALPHA);
+ left = LoadImageNoPrefix("/images/left.png", IMG_ALPHA);
+ right = LoadImageNoPrefix("/images/right.png", IMG_ALPHA);
if (!world || !left || !right || !CurrentBkgd())
{
@@ -262,14 +262,14 @@
else
SetupPaths(NULL);
- map = LoadImage( "map.png", IMG_ALPHA|IMG_NOT_REQUIRED );
+ map = LoadImageNoPrefix( "/images/map.png", IMG_ALPHA|IMG_NOT_REQUIRED );
if (map)
{
SDL_BlitSurface( map, NULL, screen, &worldRect );
SDL_FreeSurface( map );
}
- photo = LoadImage( "photo.png", IMG_ALPHA|IMG_NOT_REQUIRED );
+ photo = LoadImageNoPrefix( "/images/photo.png", IMG_ALPHA|IMG_NOT_REQUIRED );
if (photo)
{
photoRect.x = 480 - (photo->w/2);
Modified: branches/commonification/tuxtype/trunk/src/titlescreen.c
===================================================================
--- branches/commonification/tuxtype/trunk/src/titlescreen.c 2009-08-04 23:36:37 UTC (rev 1362)
+++ branches/commonification/tuxtype/trunk/src/titlescreen.c 2009-08-04 23:39:54 UTC (rev 1363)
@@ -142,7 +142,7 @@
* Display the Standby screen....
*/
show_logo();
- snd_welcome = LoadSound("harp.wav");
+ snd_welcome = LoadSoundNoPrefix("/sounds/harp.wav");
if (snd_welcome && settings.menu_sound)
{
@@ -237,7 +237,7 @@
/* Start playing menu music if desired: */
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
LOG( "Tux and Title are in place now\n" );
@@ -313,7 +313,7 @@
else
{
settings.menu_music = 1;
- AudioMusicLoad("tuxi.ogg", -1);
+ AudioMusicLoad("/sounds/tuxi.ogg", -1);
}
redraw = 1;
}
@@ -369,7 +369,7 @@
else
{
settings.menu_music = 1;
- AudioMusicLoad("tuxi.ogg", -1);
+ AudioMusicLoad("/sounds/tuxi.ogg", -1);
}
redraw = 1;
break;
@@ -514,7 +514,7 @@
redraw = 1;
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
}
@@ -528,7 +528,7 @@
redraw = 1;
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
}
@@ -548,7 +548,7 @@
load_media();
if (settings.menu_music)
- AudioMusicLoad("tuxi.ogg", -1);
+ AudioMusicLoad("/sounds/tuxi.ogg", -1);
redraw = 1;
}
@@ -568,7 +568,7 @@
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
}
load_media();
@@ -591,7 +591,7 @@
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
}
load_media();
@@ -613,7 +613,7 @@
}
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
}
load_media();
@@ -636,7 +636,7 @@
// load_media();
// if (settings.menu_music)
-// AudioMusicLoad( "tuxi.ogg", -1 );
+// AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
redraw = 1;
}
@@ -654,7 +654,7 @@
load_media();
if (settings.menu_music)
- AudioMusicLoad( "tuxi.ogg", -1 );
+ AudioMusicLoad( "/sounds/tuxi.ogg", -1 );
redraw = 1;
}
@@ -851,7 +851,7 @@
if (settings.show_tux4kids)
{
SDL_Rect logo_rect;
- SDL_Surface* t4k_logo = LoadImage("standby.png", IMG_REGULAR|IMG_NO_THEME);
+ SDL_Surface* t4k_logo = LoadImageNoPrefix("/images/standby.png", IMG_REGULAR|IMG_NO_THEME);
if (t4k_logo) /* Avoid segfault */
{
@@ -903,8 +903,8 @@
max = sel_text[i][j]->w;
/* --- load animated icon for menu item --- */
- sprintf(fn, "menu/%s", menu_icon[i][j]);
- menu_gfx[i][j] = LoadSprite(fn, IMG_ALPHA);
+ sprintf(fn, "/images/menu/%s", menu_icon[i][j]);
+ menu_gfx[i][j] = LoadSpriteNoPrefix(fn, IMG_ALPHA);
}
menu_width[j] = max + 20 + 40; // Not clear where '20' and '40' are coming from
}
@@ -1008,8 +1008,8 @@
/* --- load sounds --- */
if (settings.menu_sound)
{
- snd_move = LoadSound("tock.wav");
- snd_select = LoadSound("pop.wav");
+ snd_move = LoadSoundNoPrefix("/sounds/tock.wav");
+ snd_select = LoadSoundNoPrefix("/sounds/pop.wav");
if (!snd_move || !snd_select)
{
fprintf(stderr, "Could not load menu sounds - turning menu_sound off\n");
@@ -1018,13 +1018,13 @@
}
/* --- load graphics --- */
- LoadBothBkgds("main_bkg.png");
- title = LoadImage( "title1.png", IMG_ALPHA );
- speaker = LoadImage( "sound.png", IMG_ALPHA );
- speakeroff = LoadImage( "nosound.png", IMG_ALPHA );
-// sel = LoadSprite("menu/sel", IMG_ALPHA);
-// reg = LoadSprite("menu/reg", IMG_ALPHA);
- Tux = LoadSprite("tux", IMG_ALPHA);
+ LoadBothBkgds("/images/main_bkg.png");
+ title = LoadImageNoPrefix( "/images/title1.png", IMG_ALPHA );
+ speaker = LoadImageNoPrefix( "/images/sound.png", IMG_ALPHA );
+ speakeroff = LoadImageNoPrefix( "/images/nosound.png", IMG_ALPHA );
+// sel = LoadSpriteNoPrefix("/images/menu/sel", IMG_ALPHA);
+// reg = LoadSpriteNoPrefix("/images/menu/reg", IMG_ALPHA);
+ Tux = LoadSpriteNoPrefix("/images/tux", IMG_ALPHA);
DEBUGCODE
{
@@ -1117,7 +1117,7 @@
s3 = BlackOutline( gettext_noop("Discuss the future of TuxTyping at"), DEFAULT_MENU_FONT_SIZE, &white);
s4 = BlackOutline( "http://tux4kids.alioth.debian.org/", DEFAULT_MENU_FONT_SIZE, &white);
- tux = LoadSprite("tux/tux-egypt", IMG_ALPHA);
+ tux = LoadSpriteNoPrefix("/images/tux/tux-egypt", IMG_ALPHA);
if (s1 && s2 && s3 && s4 && tux)
{
@@ -1301,8 +1301,8 @@
select[i] = BlackOutline( wordlistName[i], DEFAULT_MENU_FONT_SIZE, &yellow);
}
- left = LoadImage("left.png", IMG_ALPHA);
- right = LoadImage("right.png", IMG_ALPHA);
+ left = LoadImageNoPrefix("/images/left.png", IMG_ALPHA);
+ right = LoadImageNoPrefix("/images/right.png", IMG_ALPHA);
/* Get out if needed surface not loaded successfully: */
if (!CurrentBkgd() || !left || !right)
@@ -1590,7 +1590,7 @@
settings.use_english = old_use_english;
- bkg = LoadImage("main_bkg.png", IMG_REGULAR);
+ bkg = LoadImageNoPrefix("/images/main_bkg.png", IMG_REGULAR);
/* set initial rect sizes */
@@ -1782,13 +1782,13 @@
settings.use_english = old_use_english;
strncpy(settings.theme_data_path, old_theme_path, FNLEN - 1);
- bkg = LoadImage("main_bkg.png", IMG_REGULAR);
+ bkg = LoadImageNoPrefix("/images/main_bkg.png", IMG_REGULAR);
- left = LoadImage("left.png", IMG_ALPHA);
+ left = LoadImageNoPrefix("/images/left.png", IMG_ALPHA);
leftRect.w = left->w; leftRect.h = left->h;
leftRect.x = 320 - 100 - (leftRect.w/2); leftRect.y = 430;
- right = LoadImage("right.png", IMG_ALPHA);
+ right = LoadImageNoPrefix("/images/right.png", IMG_ALPHA);
rightRect.w = right->w; rightRect.h = right->h;
rightRect.x = 320 + 100 - (rightRect.w/2); rightRect.y = 430;
More information about the Tux4kids-commits
mailing list