diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-20 15:30:08 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-20 15:30:08 (GMT) |
| commit | bd262d8c929cf27b6d79e348d3f7b4b4aa939344 (patch) | |
| tree | f393d62dfbbc07d850de9d73aeafd4e789af2cf8 /src | |
| parent | 35f84a09422e5243432530e6239bfc3de5e9846c (diff) | |
| parent | 3979395e651a5b45fa1b96a19646b72e4a20e2f8 (diff) | |
| download | powder-bd262d8c929cf27b6d79e348d3f7b4b4aa939344.zip powder-bd262d8c929cf27b6d79e348d3f7b4b4aa939344.tar.gz | |
Merge pull request #136 from mniip/scons
mingw compiling fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/PowderToySDL.cpp | 3 | ||||
| -rw-r--r-- | src/gui/game/GameView.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index f61a55e..94559b2 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -16,8 +16,8 @@ #include "graphics/Graphics.h" #if defined(LIN) #include "icon.h" -#include <signal.h> #endif +#include <signal.h> #ifndef WIN #include <unistd.h> @@ -786,7 +786,6 @@ int main(int argc, char * argv[]) signal(SIGFPE, SigHandler); signal(SIGILL, SigHandler); signal(SIGABRT, SigHandler); - #endif GameController * gameController = NULL; diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index 12414c7..883435e 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -1212,7 +1212,7 @@ void GameView::BeginStampSelection() { selectMode = SelectStamp; selectPoint1 = ui::Point(-1, -1); - buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to create a stamp (right click = cancel)"; + buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to create a stamp (right click = cancel)"; buttonTipShow = 120; } @@ -1392,7 +1392,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool { selectMode = SelectCopy; selectPoint1 = ui::Point(-1, -1); - buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to copy (right click = cancel)"; + buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy (right click = cancel)"; buttonTipShow = 120; } break; @@ -1401,7 +1401,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool { selectMode = SelectCut; selectPoint1 = ui::Point(-1, -1); - buttonTip = "\x0F\xEF\xEF\x10\Click-and-drag to specify an area to copy then cut (right click = cancel)"; + buttonTip = "\x0F\xEF\xEF\020Click-and-drag to specify an area to copy then cut (right click = cancel)"; buttonTipShow = 120; } break; |