m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue 127 : program path under unix was stored relative when launching the program with "./grafx2" in the dev directory, so font loading failed when changing directory (loading a pic, for example).

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@727 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-04-07 12:28:53 +00:00
parent 15e11b7144
commit 385a99d1f6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io.c
View File

@ -194,9 +194,9 @@ void Extract_filename(char *dest, const char *source)
// Récupère la partie "répertoire+/" d'un chemin. // Récupère la partie "répertoire+/" d'un chemin.
void Extract_path(char *dest, const char *source) void Extract_path(char *dest, const char *source)
{ {
char * position; char * position=NULL;
strcpy(dest,source); realpath(source,dest);
position = Find_last_slash(dest); position = Find_last_slash(dest);
if (position) if (position)
*(position+1) = '\0'; *(position+1) = '\0';

7
text.c
View File

@ -55,6 +55,7 @@
#include "global.h" #include "global.h"
#include "sdlscreen.h" #include "sdlscreen.h"
#include "io.h" #include "io.h"
#include "errors.h"
typedef struct T_Font typedef struct T_Font
{ {
@ -459,10 +460,14 @@ byte *Render_text_SFont(const char *str, int font_number, int *width, int *heigh
// Chargement de la fonte // Chargement de la fonte
Surface_fonte=IMG_Load(Font_name(font_number)); Surface_fonte=IMG_Load(Font_name(font_number));
if (!Surface_fonte) if (!Surface_fonte)
{
DEBUG("Font loading failed",0);
return NULL; return NULL;
}
font=SFont_InitFont(Surface_fonte); font=SFont_InitFont(Surface_fonte);
if (!font) if (!font)
{ {
DEBUG("Font init failed",1);
return NULL; return NULL;
} }
@ -475,6 +480,7 @@ byte *Render_text_SFont(const char *str, int font_number, int *width, int *heigh
SFont_Write(TexteColore, font, 0, 0, str); SFont_Write(TexteColore, font, 0, 0, str);
if (!TexteColore) if (!TexteColore)
{ {
DEBUG("Rendering failed",2);
SFont_FreeFont(font); SFont_FreeFont(font);
return NULL; return NULL;
} }
@ -485,6 +491,7 @@ byte *Render_text_SFont(const char *str, int font_number, int *width, int *heigh
new_brush=Surface_to_bytefield(Texte8Bit, NULL); new_brush=Surface_to_bytefield(Texte8Bit, NULL);
if (!new_brush) if (!new_brush)
{ {
DEBUG("Converting failed",3);
SDL_FreeSurface(TexteColore); SDL_FreeSurface(TexteColore);
SDL_FreeSurface(Texte8Bit); SDL_FreeSurface(Texte8Bit);
SFont_FreeFont(font); SFont_FreeFont(font);