npcs and tutorial stuff

[carveJwlIkooP6JGAAIwe30JlM.git] / font.h

diff --git a/font.h b/font.h
index a7836139ffc574b06a082c35362b499d5f71a245..608c71d38c02c4953f37efeede7be00ebb7ed211 100644 (file)
--- a/font.h
+++ b/font.h
@@ -139,12 +139,13 @@ static void font3d_bind( font3d *font, enum font_shader shader,
    glActiveTexture( GL_TEXTURE1 );
    glBindTexture( GL_TEXTURE_2D, font->texture );
 
-   if( shader == k_font_shader_default ){
+   if( shader == k_font_shader_default )
+   {
       shader_model_font_use();
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
       shader_model_font_uTexMain( 1 );
+      shader_model_font_uDepthMode( depth_compare );
 
-      shader_model_font_uDepthCompare( depth_compare );
       if( depth_compare ){
          depth_compare_bind( 
             shader_model_font_uTexSceneDepth,
@@ -154,7 +155,8 @@ static void font3d_bind( font3d *font, enum font_shader shader,
 
       shader_model_font_uPv( cam->mtx.pv );
    }
-   else if( shader == k_font_shader_world ){
+   else if( shader == k_font_shader_world )
+   {
       shader_scene_font_use();
       shader_scene_font_uTexGarbage(0);
       shader_scene_font_uTexMain(1);