Vertices can now render themselves - not sure what to do about edges, right now game is still doing them

menubutton.cpp

@@ -95,10 +95,13 @@ void MenuButton::set_state(Mode mode, VertexType type, GameVertex* current)
 	)
 	selected = true;
 
+    // no optional buttons if current == NULL, period
+    if (current == NULL) return;
+
     // If we have selected one of our vertices, and we're one of the three
     // main buttons, be visible
-    if (current != NULL && action & (BUTTON_ATTACK | BUTTON_MOVE |
-				     BUTTON_BUILD))
+    if (action & (BUTTON_ATTACK | BUTTON_MOVE |
+		  BUTTON_BUILD))
 	visible = true;
 
     // If we're one of the other three, and we're in MODE_BUILD, we're visible