Merge pull request OpenXcom#868 from ajschult/umrBranch2

SupSuper · SupSuper · commit 8d8ad359bcb4 · 2014-07-03T16:57:03.000+01:00
only look at event button for button events
diff --git a/src/Battlescape/BattlescapeState.cpp b/src/Battlescape/BattlescapeState.cpp
@@ -1460,7 +1460,7 @@ void BattlescapeState::warning(const std::string &message)
  */
 inline void BattlescapeState::handle(Action *action)
 {
-	if (_game->getCursor()->getVisible() || action->getDetails()->button.button == SDL_BUTTON_RIGHT)
+	if (_game->getCursor()->getVisible() || (action->getDetails()->type == SDL_MOUSEBUTTONDOWN && action->getDetails()->button.button == SDL_BUTTON_RIGHT))
 	{
 		State::handle(action);
 

Original file line number	Diff line number	Diff line change
`@@ -1460,7 +1460,7 @@ void BattlescapeState::warning(const std::string &message)`
`1460`	`1460`	`*/`
`1461`	`1461`	`inline void BattlescapeState::handle(Action *action)`
`1462`	`1462`	`{`
`1463`		`- if (_game->getCursor()->getVisible() \|\| action->getDetails()->button.button == SDL_BUTTON_RIGHT)`
	`1463`	`+ if (_game->getCursor()->getVisible() \|\| (action->getDetails()->type == SDL_MOUSEBUTTONDOWN && action->getDetails()->button.button == SDL_BUTTON_RIGHT))`
`1464`	`1464`	`{`
`1465`	`1465`	`State::handle(action);`
`1466`	`1466`