Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Warzone2100/warzone2100
base: 8ffb137
...
head fork: Warzone2100/warzone2100
compare: 13070eb
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 25, 2011
@buginator buginator Revert "Fix MMB use."
open ticket:2578

This reverts commit b3dcccb.

Conflicts:

	lib/framework/wzapp.cpp
60099b7
@buginator buginator ignore moc generated files 13070eb
Showing with 3 additions and 14 deletions.
  1. +1 −1  .gitignore
  2. +2 −13 lib/framework/wzapp.cpp
View
2  .gitignore
@@ -79,7 +79,7 @@ win32/__BUILD_CONFIG.USER
*.lex.[ch]pp
*.tab.[ch]pp
/src/autorevision.h
-
+*.moc.h
# Generated executables:
/build_tools/autorevision/autorevision
View
15 lib/framework/wzapp.cpp
@@ -869,12 +869,7 @@ void SetMousePos(uint16_t x, uint16_t y)
/* This returns true if the mouse key is currently depressed */
bool mouseDown(MOUSE_KEY_CODE code)
{
- return ((aMouseState[code].state != KEY_UP)
- ||
- // holding down LMB and RMB counts as holding down MMB
- (code == MOUSE_MMB)
- ||
- (aMouseState[MOUSE_LMB].state != KEY_UP && aMouseState[MOUSE_RMB].state != KEY_UP));
+ return (aMouseState[code].state != KEY_UP);
}
/* This returns true if the mouse key was double clicked */
@@ -902,13 +897,7 @@ bool mouseReleased(MOUSE_KEY_CODE code)
/* Check for a mouse drag, return the drag start coords if dragging */
bool mouseDrag(MOUSE_KEY_CODE code, UDWORD *px, UDWORD *py)
{
-
- if ((aMouseState[code].state == KEY_DRAG)
- ||
- (code == MOUSE_MMB )
- ||
- // dragging LMB and RMB counts as dragging MMB
- (aMouseState[MOUSE_LMB].state != KEY_UP && aMouseState[MOUSE_RMB].state == KEY_DRAG))
+ if (aMouseState[code].state == KEY_DRAG)
{
*px = dragX;
*py = dragY;

No commit comments for this range

Something went wrong with that request. Please try again.