Merge commit '87f4eea939309a5ea1972323e237d23afdf01104' into master-merge

[xonotic/netradiant.git] / radiant / xywindow.h

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 36a5f1cb786258cf6f4999ebfe918b9ca9131487..41fb89f89b9b053d6ce663a4687ce9fb3e722156 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -213,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;
@@ -268,7 +270,7 @@ struct xywindow_globals_t
        Vector3 AxisColorY;
        Vector3 AxisColorZ;
 
-       bool m_bRightClick;
+//     bool m_bRightClick;
        bool m_bNoStipple;
        bool m_bImprovedWheelZoom;
 
@@ -288,7 +290,7 @@ 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_bRightClick( true ),
                m_bNoStipple( true ),
                m_bImprovedWheelZoom( true ){
        }