From d902c78327acdc5ec4a35119be2eb92399fdb43d Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 16 Apr 2009 01:04:20 +0200 Subject: Revert "new path API ( need old path.h )" This reverts commit 75e3e2c04b1d2b324dc8d2314e570bcba215c93f. -- CZECH SECTION -- Dusane kdyz rikam ze to ma podporovat PREDEFINOVANI pomoci cmake promennejch jako to delalo tak to neznamena ze danou cast kodu proste odstranis a cmake si to bude generovat do /dev/null Tim commitem si rozbil vsechny architektury ktery nepouzivaj strukturu v jednom hlavnim adresari. Gentoo, Slackware pro zacatek dalsi nevim. Fakt to vubec nedelej takhle, je to zbytecna prace. --- src/client/game.c | 7 +------ src/client/image.c | 8 ++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/client') diff --git a/src/client/game.c b/src/client/game.c index 42a5868..8e0c30a 100644 --- a/src/client/game.c +++ b/src/client/game.c @@ -14,7 +14,6 @@ #include "item.h" #include "shot.h" #include "arenaFile.h" -#include "my_path.h" #include "image.h" #include "layer.h" @@ -46,8 +45,7 @@ static void initGame() { home_director_create(); - - path_init(); + interface_init(); font_init(); layer_init(); @@ -79,7 +77,6 @@ static void initGame() void game_quit() { - interface_quit(); main_menu_quit(); @@ -109,8 +106,6 @@ void game_quit() audio_quit(); #endif - path_quit(); - DEBUG_MSG(_("Quitting TUXANCI...\n")); exit(0); diff --git a/src/client/image.c b/src/client/image.c index b17e471..fa34760 100644 --- a/src/client/image.c +++ b/src/client/image.c @@ -6,7 +6,6 @@ #include "main.h" #include "list.h" #include "storage.h" -#include "my_path.h" #include "interface.h" #include "image.h" @@ -40,7 +39,12 @@ static SDL_Surface *loadImage(const char *filename, int alpha) char str[STR_PATH_SIZE]; - path_set_prefix(str, STR_PATH_SIZE, PATH_PREFIX_IMAGE, filename); + + if (isFillPath(filename)) { + strcpy(str, filename); + } else { + sprintf(str, PATH_IMAGE "%s", filename); + } accessExistFile(str); -- cgit v1.2.3