matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some more compiling fixes

Browse Source
This commit is contained in:
mniip 2013-05-17 18:32:41 +04:00
parent 32fe184351
commit 3a640fee3f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/PowderToySDL.cpp
View File

@ -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;

6
src/gui/game/GameView.cpp
View File

@ -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;