Skip to content

Commit c6e90f3

Browse files
bobtistabobtista
committed
refactor(input): Rename mouse button state changed variables
1 parent 431534c commit c6e90f3

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎Generals/Code/GameEngine/Include/GameClient/Mouse.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ struct MouseIO
107107

108108
MouseButtonState leftState; // button state: Up, Down, DoubleClick (Which is also down)
109109
Int leftEvent; // Most important event this frame
110-
Bool leftButtonStateChanged; // TRUE if button state changed for a given mouse event
110+
Bool leftStateChanged; // TRUE if button state changed for a given mouse event
111111

112112
MouseButtonState rightState;
113113
Int rightEvent;
114-
Bool rightButtonStateChanged; // TRUE if button state changed for a given mouse event
114+
Bool rightStateChanged; // TRUE if button state changed for a given mouse event
115115

116116
MouseButtonState middleState;
117117
Int middleEvent;
118-
Bool middleButtonStateChanged; // TRUE if button state changed for a given mouse event
118+
Bool middleStateChanged; // TRUE if button state changed for a given mouse event
119119
};
120120

121121
class CursorInfo

‎Generals/Code/GameEngine/Source/GameClient/Input/Mouse.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ void Mouse::processMouseEvent( Int index )
218218
m_currMouse.wheelPos += m_mouseEvents[ index ].wheelPos;
219219

220220
// Check Left Mouse State
221-
if( m_mouseEvents[ index ].leftButtonStateChanged )
221+
if( m_mouseEvents[ index ].leftStateChanged )
222222
{
223223
if( m_currMouse.leftState != m_mouseEvents[ index ].leftState )
224224
{
@@ -228,21 +228,21 @@ void Mouse::processMouseEvent( Int index )
228228
// Mouse Down
229229
m_currMouse.leftEvent = GWM_LEFT_DOWN;
230230
m_currMouse.leftState = MBS_Down;
231-
m_currMouse.leftButtonStateChanged = TRUE;
231+
m_currMouse.leftStateChanged = TRUE;
232232
}
233233
else if ( m_mouseEvents[ index ].leftState == MBS_DoubleClick )
234234
{
235235
// Mouse Double Click
236236
m_currMouse.leftEvent = GWM_LEFT_DOUBLE_CLICK;
237237
m_currMouse.leftState = MBS_DoubleClick;
238-
m_currMouse.leftButtonStateChanged = TRUE;
238+
m_currMouse.leftStateChanged = TRUE;
239239
}
240240
else
241241
{
242242
// Mouse Up
243243
m_currMouse.leftEvent = GWM_LEFT_UP;
244244
m_currMouse.leftState = MBS_Up;
245-
m_currMouse.leftButtonStateChanged = TRUE;
245+
m_currMouse.leftStateChanged = TRUE;
246246
}
247247
}
248248
}
@@ -254,7 +254,7 @@ void Mouse::processMouseEvent( Int index )
254254
}
255255

256256
// Check Right Mouse State
257-
if( m_mouseEvents[ index ].rightButtonStateChanged )
257+
if( m_mouseEvents[ index ].rightStateChanged )
258258
{
259259
if( m_currMouse.rightState != m_mouseEvents[ index ].rightState )
260260
{
@@ -264,21 +264,21 @@ void Mouse::processMouseEvent( Int index )
264264
// Mouse Down
265265
m_currMouse.rightEvent = GWM_RIGHT_DOWN;
266266
m_currMouse.rightState = MBS_Down;
267-
m_currMouse.rightButtonStateChanged = TRUE;
267+
m_currMouse.rightStateChanged = TRUE;
268268
}
269269
else if( m_mouseEvents[ index ].rightState == MBS_DoubleClick )
270270
{
271271
// Mouse Double Click
272272
m_currMouse.rightEvent = GWM_RIGHT_DOUBLE_CLICK;
273273
m_currMouse.rightState = MBS_DoubleClick;
274-
m_currMouse.rightButtonStateChanged = TRUE;
274+
m_currMouse.rightStateChanged = TRUE;
275275
}
276276
else
277277
{
278278
// Mouse Up
279279
m_currMouse.rightEvent = GWM_RIGHT_UP;
280280
m_currMouse.rightState = MBS_Up;
281-
m_currMouse.rightButtonStateChanged = TRUE;
281+
m_currMouse.rightStateChanged = TRUE;
282282
}
283283
}
284284
}
@@ -290,7 +290,7 @@ void Mouse::processMouseEvent( Int index )
290290
}
291291

292292
// Check Middle Mouse State
293-
if( m_mouseEvents[ index ].middleButtonStateChanged )
293+
if( m_mouseEvents[ index ].middleStateChanged )
294294
{
295295
if( m_currMouse.middleState != m_mouseEvents[index].middleState )
296296
{
@@ -299,20 +299,20 @@ void Mouse::processMouseEvent( Int index )
299299
{
300300
m_currMouse.middleEvent = GWM_MIDDLE_DOWN;
301301
m_currMouse.middleState = MBS_Down;
302-
m_currMouse.middleButtonStateChanged = TRUE;
302+
m_currMouse.middleStateChanged = TRUE;
303303
}
304304
else if( m_mouseEvents[index].middleState == MBS_DoubleClick )
305305
{
306306
m_currMouse.middleEvent = GWM_MIDDLE_DOUBLE_CLICK;
307307
m_currMouse.middleState = MBS_DoubleClick;
308-
m_currMouse.middleButtonStateChanged = TRUE;
308+
m_currMouse.middleStateChanged = TRUE;
309309
}
310310
else
311311
{
312312
// Mouse Up
313313
m_currMouse.middleEvent = GWM_MIDDLE_UP;
314314
m_currMouse.middleState = MBS_Up;
315-
m_currMouse.middleButtonStateChanged = TRUE;
315+
m_currMouse.middleStateChanged = TRUE;
316316
}
317317
}
318318
}

‎Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIMouse.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ UnsignedByte DirectInputMouse::getMouseEvent( MouseIO *result, Bool flush )
202202

203203
/* set these to defaults */
204204
result->leftState = result->middleState = result->rightState = FALSE;
205-
result->leftButtonStateChanged = result->middleButtonStateChanged = result->rightButtonStateChanged = FALSE;
205+
result->leftStateChanged = result->middleStateChanged = result->rightStateChanged = FALSE;
206206
result->pos.x = result->pos.y = result->wheelPos = 0;
207207

208208
if( m_pMouseDevice )
@@ -283,17 +283,17 @@ void DirectInputMouse::mapDirectInputMouse( MouseIO *mouse,
283283
{
284284
case DIMOFS_BUTTON0:
285285
mouse->leftState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
286-
mouse->leftButtonStateChanged = TRUE;
286+
mouse->leftStateChanged = TRUE;
287287
break;
288288

289289
case DIMOFS_BUTTON1:
290290
mouse->rightState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
291-
mouse->rightButtonStateChanged = TRUE;
291+
mouse->rightStateChanged = TRUE;
292292
break;
293293

294294
case DIMOFS_BUTTON2:
295295
mouse->middleState = (( mdat->dwData & 0x0080 ) ? TRUE : FALSE);
296-
mouse->middleButtonStateChanged = TRUE;
296+
mouse->middleStateChanged = TRUE;
297297
break;
298298

299299
case DIMOFS_BUTTON3:

‎Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32Mouse.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
8888

8989
// set these to defaults
9090
result->leftState = result->middleState = result->rightState = MBS_Up;
91-
result->leftButtonStateChanged = result->middleButtonStateChanged = result->rightButtonStateChanged = FALSE;
91+
result->leftStateChanged = result->middleStateChanged = result->rightStateChanged = FALSE;
9292
result->pos.x = result->pos.y = result->wheelPos = 0;
9393

9494
// Time is the same for all events
@@ -102,7 +102,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
102102
{
103103

104104
result->leftState = MBS_Down;
105-
result->leftButtonStateChanged = TRUE;
105+
result->leftStateChanged = TRUE;
106106
result->pos.x = LOWORD( lParam );
107107
result->pos.y = HIWORD( lParam );
108108
break;
@@ -114,7 +114,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
114114
{
115115

116116
result->leftState = MBS_Up;
117-
result->leftButtonStateChanged = TRUE;
117+
result->leftStateChanged = TRUE;
118118
result->pos.x = LOWORD( lParam );
119119
result->pos.y = HIWORD( lParam );
120120
break;
@@ -126,7 +126,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
126126
{
127127

128128
result->leftState = MBS_DoubleClick;
129-
result->leftButtonStateChanged = TRUE;
129+
result->leftStateChanged = TRUE;
130130
result->pos.x = LOWORD( lParam );
131131
result->pos.y = HIWORD( lParam );
132132
break;
@@ -138,7 +138,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
138138
{
139139

140140
result->middleState = MBS_Down;
141-
result->middleButtonStateChanged = TRUE;
141+
result->middleStateChanged = TRUE;
142142
result->pos.x = LOWORD( lParam );
143143
result->pos.y = HIWORD( lParam );
144144
break;
@@ -150,7 +150,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
150150
{
151151

152152
result->middleState = MBS_Up;
153-
result->middleButtonStateChanged = TRUE;
153+
result->middleStateChanged = TRUE;
154154
result->pos.x = LOWORD( lParam );
155155
result->pos.y = HIWORD( lParam );
156156
break;
@@ -162,7 +162,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
162162
{
163163

164164
result->middleState = MBS_DoubleClick;
165-
result->middleButtonStateChanged = TRUE;
165+
result->middleStateChanged = TRUE;
166166
result->pos.x = LOWORD( lParam );
167167
result->pos.y = HIWORD( lParam );
168168
break;
@@ -174,7 +174,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
174174
{
175175

176176
result->rightState = MBS_Down;
177-
result->rightButtonStateChanged = TRUE;
177+
result->rightStateChanged = TRUE;
178178
result->pos.x = LOWORD( lParam );
179179
result->pos.y = HIWORD( lParam );
180180
break;
@@ -186,7 +186,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
186186
{
187187

188188
result->rightState = MBS_Up;
189-
result->rightButtonStateChanged = TRUE;
189+
result->rightStateChanged = TRUE;
190190
result->pos.x = LOWORD( lParam );
191191
result->pos.y = HIWORD( lParam );
192192
break;
@@ -198,7 +198,7 @@ void Win32Mouse::translateEvent( UnsignedInt eventIndex, MouseIO *result )
198198
{
199199

200200
result->rightState = MBS_DoubleClick;
201-
result->rightButtonStateChanged = TRUE;
201+
result->rightStateChanged = TRUE;
202202
result->pos.x = LOWORD( lParam );
203203
result->pos.y = HIWORD( lParam );
204204
break;

0 commit comments

Comments
 (0)