[Tux4kids-commits] r1612 - branches/commonification/t4kcommon/trunk/src

[David Bruce]

Author: dbruce-guest
Date: 2009-10-27 11:06:11 +0000 (Tue, 27 Oct 2009)
New Revision: 1612

Modified:
   branches/commonification/t4kcommon/trunk/src/t4k-common.h
   branches/commonification/t4kcommon/trunk/src/t4k-globals.h
   branches/commonification/t4kcommon/trunk/src/t4k-sdl.c
Log:
Added #include "config.h" to globals header and activated text code in t4k-sdl.c (still needs work)

Modified: branches/commonification/t4kcommon/trunk/src/t4k-common.h
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-common.h	2009-10-27 11:05:56 UTC (rev 1611)
+++ branches/commonification/t4kcommon/trunk/src/t4k-common.h	2009-10-27 11:06:11 UTC (rev 1612)
@@ -122,7 +122,9 @@
 int             EraseSprite(sprite* img, SDL_Surface* curr_bkgd, int x, int y);
 int             EraseObject(SDL_Surface* surf, SDL_Surface* curr_bkgd, int x, int y);
 
+/* TODO add prototypes for t4k-sdl.c text functions */
 
+
 /* from tk4-loaders.c */
 #define IMG_REGULAR         0x01
 #define IMG_COLORKEY        0x02

Modified: branches/commonification/t4kcommon/trunk/src/t4k-globals.h
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-globals.h	2009-10-27 11:05:56 UTC (rev 1611)
+++ branches/commonification/t4kcommon/trunk/src/t4k-globals.h	2009-10-27 11:06:11 UTC (rev 1612)
@@ -10,6 +10,8 @@
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
+#include "config.h"
+
 #include "SDL.h"
 
 #define REG_RGBA 16,16,96,96

Modified: branches/commonification/t4kcommon/trunk/src/t4k-sdl.c
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-sdl.c	2009-10-27 11:05:56 UTC (rev 1611)
+++ branches/commonification/t4kcommon/trunk/src/t4k-sdl.c	2009-10-27 11:06:11 UTC (rev 1612)
@@ -1172,7 +1172,8 @@
   return 1;
 }
 
-#if 0
+//#if 0
+
 /************************************************************************/
 /*                                                                      */
 /*        Begin text drawing functions                                  */
@@ -1554,6 +1555,7 @@
 }
 
 #else
+
 /* Local functions when using SDL_ttf: */
 
 static void free_font_list(void)
@@ -1608,7 +1610,7 @@
 {
   TTF_Font* f;
   char fontfile[PATH_MAX];
-  sprintf(fontfile, "%s/fonts/%s", data_prefix, font_name);
+  sprintf(fontfile, "%s/fonts/%s", COMMON_DATA_PREFIX, font_name);
 
   f = TTF_OpenFont(fontfile, font_size);
 
@@ -1633,6 +1635,7 @@
    return NULL;
   }
 }
-#endif
 
+//#endif
+
 #endif