From 3ffa5e7d6cfbcc6f87a28916c194e94bb8572f7b Mon Sep 17 00:00:00 2001 From: Miriam Ruiz Date: Wed, 3 Dec 2008 12:10:31 +0100 Subject: [PATCH] Use an absolute directory in /usr/share/games/ for game data --- src/filehelp.cpp | 5 +++-- src/gkernel.cpp | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/filehelp.cpp b/src/filehelp.cpp index 0462026..a385235 100644 --- a/src/filehelp.cpp +++ b/src/filehelp.cpp @@ -22,10 +22,11 @@ // -------------------------------------------------------- char *where_is_the_filename(char *buffer, const char *filename) { -char str[2048], str2[2048]; // buffer for path making +char str[2048] = "/usr/share/games/kball/", + str2[2048]; // buffer for path making // check in current executable path -get_executable_name(str, 2048); +//get_executable_name(str, 2048); replace_filename(str2, str, filename, 2048); if (! exists(filename) ) diff --git a/src/gkernel.cpp b/src/gkernel.cpp index 1b10bae..554b7f7 100644 --- a/src/gkernel.cpp +++ b/src/gkernel.cpp @@ -794,12 +794,14 @@ void CGameKernel::play_a_full_campaign(char *level_filename) clear_bitmap(screen); textout_centre_ex(screen, font, "[ Please wait... loading... ]", SCREEN_W / 2, SCREEN_H / 2, makecol(255, 255, 255), makecol(0, 0, 64)); - DATAFILE *dattmp = load_datafile_object(SPRITES_FILE, "WON_BMP"); + char tmp_file_buf[2048]; + + DATAFILE *dattmp = load_datafile_object(where_is_the_filename(tmp_file_buf, SPRITES_FILE), "WON_BMP"); if (!dattmp) raise_error("CGameKernel::play_a_full_campaign\nCan't load %s -> WON_BMP\n", SPRITES_FILE); BITMAP *bmp_won = (BITMAP *)dattmp->dat; - DATAFILE *dattmp2 = load_datafile_object(SPRITES_FILE, "GAME_SCORE_FONT"); + DATAFILE *dattmp2 = load_datafile_object(where_is_the_filename(tmp_file_buf, SPRITES_FILE), "GAME_SCORE_FONT"); if (!dattmp2) raise_error("CGameKernel::play_a_full_campaign\nCan't load %s -> GAME_SCORE_FONT\n", SPRITES_FILE); FONT *fs = (FONT *)dattmp2->dat; @@ -810,7 +812,7 @@ void CGameKernel::play_a_full_campaign(char *level_filename) stats.print(screen, 150, makecol(0,0,255), -1, fs); // sound - DATAFILE *dattmp3 = load_datafile_object(SPRITES_FILE, "WON_WAV"); + DATAFILE *dattmp3 = load_datafile_object(where_is_the_filename(tmp_file_buf, SPRITES_FILE), "WON_WAV"); if (dattmp3) { play_sample((SAMPLE *)dattmp3->dat,255,128,1000,0); -- 2.11.4.GIT