Small fixes
authorunc0rr
Mon, 16 Oct 2006 19:20:13 +0000
changeset 200 a36102728776
parent 199 f156e54736a4
child 201 c9610ad20fef
Small fixes
hedgewars/SDLh.pas
hedgewars/hwengine.dpr
hedgewars/uStore.pas
--- a/hedgewars/SDLh.pas	Mon Oct 16 17:26:50 2006 +0000
+++ b/hedgewars/SDLh.pas	Mon Oct 16 19:20:13 2006 +0000
@@ -232,14 +232,14 @@
      TTTF_Font = record
                  end;
 
-function TTF_Init: LongInt; cdecl; external SDL_TTFLibName;
+function TTF_Init: integer; cdecl; external SDL_TTFLibName;
 procedure TTF_Quit; cdecl; external SDL_TTFLibName;
 
 
-function TTF_SizeUTF8(font: PTTF_Font; const text: PChar; var w, h: integer): LongInt; cdecl; external SDL_TTFLibName;
+function TTF_SizeUTF8(font: PTTF_Font; const text: PChar; var w, h: integer): integer; cdecl; external SDL_TTFLibName;
 function TTF_RenderUTF8_Solid(font: PTTF_Font; const text: PChar; fg: TSDL_Color): PSDL_Surface; cdecl; external SDL_TTFLibName;
 function TTF_RenderUTF8_Blended(font: PTTF_Font; const text: PChar; fg: TSDL_Color): PSDL_Surface; cdecl; external SDL_TTFLibName;
-function TTF_OpenFont(const filename: Pchar; size: integer): PTTF_Font; cdecl; external SDL_TTFLibName;
+function TTF_OpenFont(const filename: PChar; size: integer): PTTF_Font; cdecl; external SDL_TTFLibName;
 
 (*  SDL_mixer *)
 
--- a/hedgewars/hwengine.dpr	Mon Oct 16 17:26:50 2006 +0000
+++ b/hedgewars/hwengine.dpr	Mon Oct 16 19:20:13 2006 +0000
@@ -205,7 +205,7 @@
 WriteLnToConsole(msgOK);
 
 WriteToConsole('Init SDL_ttf... ');
-SDLTry(TTF_Init >= 0, true);
+SDLTry(TTF_Init <> -1, true);
 WriteLnToConsole(msgOK);
 
 ShowMainWindow;
--- a/hedgewars/uStore.pas	Mon Oct 16 17:26:50 2006 +0000
+++ b/hedgewars/uStore.pas	Mon Oct 16 19:20:13 2006 +0000
@@ -253,9 +253,9 @@
     with Fontz[fi] do
          begin
          s:= Pathz[ptFonts] + '/' + Name;
-         WriteToConsole(msgLoading + s + ' ');
+         WriteToConsole(msgLoading + s + '... ');
          Handle:= TTF_OpenFont(PChar(s), Height);
-         TryDo(Handle <> nil, msgFailed, true);
+         SDLTry(Handle <> nil, true);
          WriteLnToConsole(msgOK)
          end;
 AddProgress;