X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fxywindow.h;h=41fb89f89b9b053d6ce663a4687ce9fb3e722156;hb=ef95e672ce206374ddb021de7771751e18099f4a;hp=6ace2803b4a543156a0859ba84714d28d5c09078;hpb=484defd6cf1148d020be9d3e548870ab85181b37;p=xonotic%2Fnetradiant.git

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 6ace2803..41fb89f8 100644
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -130,12 +130,23 @@ void ZoomInWithMouse( int pointx, int pointy );
 
 void Redraw();
 
+void RenderActive();
+
 void SetActive( bool b ){
 	m_bActive = b;
+	RenderActive();
 };
 bool Active(){
 	return m_bActive;
 };
+struct camera_icon_t
+{
+	float x, y, fov, box;
+	double a;
+};
+camera_icon_t Cam;
+void UpdateCameraIcon();
+
 
 void Clipper_OnLButtonDown( int x, int y );
 void Clipper_OnLButtonUp( int x, int y );
@@ -202,10 +213,12 @@ bool m_entityCreate;
 
 public:
 void ButtonState_onMouseDown( unsigned int buttons ){
-	m_buttonstate |= buttons;
+	//m_buttonstate |= buttons;
+	m_buttonstate = buttons;
 }
 void ButtonState_onMouseUp( unsigned int buttons ){
-	m_buttonstate &= ~buttons;
+	//m_buttonstate &= ~buttons;
+	m_buttonstate = 0;
 }
 unsigned int getButtonState() const {
 	return m_buttonstate;
@@ -257,7 +270,7 @@ struct xywindow_globals_t
 	Vector3 AxisColorY;
 	Vector3 AxisColorZ;
 
-	bool m_bRightClick;
+//	bool m_bRightClick;
 	bool m_bNoStipple;
 	bool m_bImprovedWheelZoom;
 
@@ -277,8 +290,8 @@ struct xywindow_globals_t
 		AxisColorX( 1.f, 0.f, 0.f ),
 		AxisColorY( 0.f, 1.f, 0.f ),
 		AxisColorZ( 0.f, 0.f, 1.f ),
-		m_bRightClick( true ),
-		m_bNoStipple( false ),
+//		m_bRightClick( true ),
+		m_bNoStipple( true ),
 		m_bImprovedWheelZoom( true ){
 	}