From 62baecac967abd24cd24f7f5465c321fdb4a45d2 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Wed, 17 Sep 2008 01:42:11 +0000
Subject: [PATCH] waypoint drawing fix

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2654 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/bot/bot_waypoint.cpp | 4 +++-
 source/src/rendergl.cpp         | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp
index 1608a05c..dc4b2a7c 100644
--- a/source/src/bot/bot_waypoint.cpp
+++ b/source/src/bot/bot_waypoint.cpp
@@ -623,6 +623,7 @@ void CWaypointClass::Think()
 
 void CWaypointClass::DrawNearWaypoints()
 {
+    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     glDisable(GL_CULL_FACE);
 
      TLinkedList<node_s *>::node_s *pNode;
@@ -767,8 +768,10 @@ void CWaypointClass::DrawNearWaypoints()
                }
           } 
      }
+#endif
     
     glEnable(GL_CULL_FACE);
+    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
      if (intermission) return;
      
@@ -782,7 +785,6 @@ void CWaypointClass::DrawNearWaypoints()
           linestyle(2.5f, 0xFF, 0x40, 0x40);
           line(int(v1.x), int(v1.y), int(v1.z), int(v2.x), int(v2.y), int(v2.z));
      }*/
-#endif     
 }
 
 // Add waypoint at location o, returns pointer of created wp
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 74a1295e..95232cc7 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -926,9 +926,7 @@ void gl_drawframe(int w, int h, float changelod, float curfps)
     if(stencilshadow && hasstencil && stencilbits >= 8) drawstencilshadows();
 
     // Added by Rick: Need todo here because of drawing the waypoints
-    glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     WaypointClass.Think();
-    glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
     // end add
 
     drawhudgun(w, h, aspect, farplane);