diff options
| author | mniip <mniip@yandex.ru> | 2013-05-17 14:32:41 (GMT) |
|---|---|---|
| committer | mniip <mniip@yandex.ru> | 2013-05-17 14:32:41 (GMT) |
| commit | 3a640fee3f20cbc82e2557271039d65c852a4817 (patch) | |
| tree | 889add577c302f9900264623970091a7e384f0a4 /src | |
| parent | 32fe184351e7bc44fd8577739c14a0c422456dac (diff) | |
| download | powder-3a640fee3f20cbc82e2557271039d65c852a4817.zip powder-3a640fee3f20cbc82e2557271039d65c852a4817.tar.gz | |
some more compiling fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/PowderToySDL.cpp | 5 | ||||
| -rw-r--r-- | src/gui/game/GameView.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index f61a55e..81c3093 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -667,6 +667,7 @@ void BlueScreen(char * detailMessage){ } } +#ifndef WIN void SigHandler(int signal) { switch(signal){ @@ -684,6 +685,7 @@ void SigHandler(int signal) break; } } +#endif int main(int argc, char * argv[]) { @@ -781,12 +783,13 @@ int main(int argc, char * argv[]) engine->SetFastQuit(Client::Ref().GetPrefBool("FastQuit", true)); #ifndef DEBUG +#ifndef WIN //Get ready to catch any dodgy errors signal(SIGSEGV, SigHandler); signal(SIGFPE, SigHandler); signal(SIGILL, SigHandler); signal(SIGABRT, SigHandler); - +#endif #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; |