diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-11 10:51:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-11 10:51:12 +0300 |
commit | 030253cdf665648eb5a16f3be910ceae26979f30 (patch) | |
tree | 1c6f2732bd77840c6056c11d788bf786bdf39299 /source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | |
parent | 80a650dfb1e73363ae6924dc5738b732bb89ded4 (diff) |
fix for building, also use const char in more places.
Diffstat (limited to 'source/gameengine/BlenderRoutines/KX_BlenderGL.cpp')
-rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 5e1e213c570..df3536424f6 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -28,14 +28,6 @@ #include "KX_BlenderGL.h" -#ifdef __cplusplus -extern "C" { -#endif -#include "BLF_api.h" -#ifdef __cplusplus -} -#endif - /* * This little block needed for linking to Blender... */ @@ -81,6 +73,7 @@ extern "C" { #include "wm_event_system.h" #include "wm_cursors.h" #include "wm_window.h" +#include "BLF_api.h" } /* end of blender block */ @@ -156,7 +149,7 @@ void BL_print_gamedebug_line(const char* text, int xco, int yco, int width, int /* the actual drawing */ glColor3ub(255, 255, 255); - BLF_draw_default(xco, height-yco, 0.0f, (char *)text); + BLF_draw_default(xco, height-yco, 0.0f, (char *)text, 65535); /* XXX, use real len */ glMatrixMode(GL_PROJECTION); glPopMatrix(); @@ -184,9 +177,9 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt /* draw in black first*/ glColor3ub(0, 0, 0); - BLF_draw_default(xco+2, height-yco-2, 0.0f, (char *)text); + BLF_draw_default(xco+2, height-yco-2, 0.0f, text, 65535); /* XXX, use real len */ glColor3ub(255, 255, 255); - BLF_draw_default(xco, height-yco, 0.0f, (char *)text); + BLF_draw_default(xco, height-yco, 0.0f, text, 65535); /* XXX, use real len */ glMatrixMode(GL_PROJECTION); glPopMatrix(); |