From 2f97c091fb27c877afe64f96aff8b7e674f010e0 Mon Sep 17 00:00:00 2001
From: Joris <joris.dauphin@gmail.com>
Date: Fri, 27 Apr 2012 10:52:04 +0200
Subject: [PATCH] Fix "typo" in Cybermind commit.
---
src/ui/botpanel.cpp | 2 +-
src/ui/interface.cpp | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/ui/botpanel.cpp b/src/ui/botpanel.cpp
index 51359ff2d..55ade7d5c 100644
--- a/src/ui/botpanel.cpp
+++ b/src/ui/botpanel.cpp
@@ -539,7 +539,7 @@ void CPopupContentTypeVariable::Draw(int x, int y, const CPopup *, const unsigne
if (this->Index != -1) {
CUnitType &type = *UnitTypes[button->Value];
- int value = type.Stats[ThisPlayer->Index].Variables[this->Index].Value;
+ int value = type.DefaultStat.Variables[this->Index].Value;
int diff = type.Stats[ThisPlayer->Index].Variables[this->Index].Value - value;
if (!diff) {
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index cf7b19e82..42aa6da03 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -1200,14 +1200,10 @@ int HandleMouseScrollArea(int x, int y)
**
** @param x screen pixel X position.
** @param y screen pixel Y position.
-**
-** @return true if the mouse has moved, false otherwise
*/
void HandleCursorMove(int *x, int *y)
{
- //
// Reduce coordinates to window-size.
- //
if (*x < 0) {
*x = 0;
} else if (*x >= Video.Width) {
@@ -1218,7 +1214,6 @@ void HandleCursorMove(int *x, int *y)
} else if (*y >= Video.Height) {
*y = Video.Height - 1;
}
-
CursorX = *x;
CursorY = *y;
}