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

modifier keys are now checked when doing stamp stuff

Browse Source
This commit is contained in:
jacob1 2015-09-19 20:20:32 -04:00
parent bbdbb67079
commit 8ecb2682aa
1 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1284,16 +1284,82 @@ void GameView::BeginStampSelection()
void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
if(introText > 50)
if (introText > 50)
{
introText = 50;
}
if(selectMode!=SelectNone)
// these key events still work when placing / creating stamps
switch (key)
{
if(selectMode==PlaceSave)
case KEY_LALT:
case KEY_RALT:
drawSnap = true;
enableAltBehaviour();
break;
case KEY_LCTRL:
case KEY_RCTRL:
if (!isMouseDown)
{
switch(key)
if (drawModeReset)
drawModeReset = false;
else
drawPoint1 = currentMouse;
if (shift)
{
if (!toolBrush)
drawMode = DrawFill;
else
drawMode = DrawPoints;
}
else
drawMode = DrawRect;
}
enableCtrlBehaviour();
break;
case KEY_LSHIFT:
case KEY_RSHIFT:
if (!isMouseDown)
{
if (drawModeReset)
drawModeReset = false;
else
drawPoint1 = currentMouse;
if (ctrl)
{
if (!toolBrush)
drawMode = DrawFill;
else
drawMode = DrawPoints;
}
else
drawMode = DrawLine;
}
enableShiftBehaviour();
break;
case ' ': //Space
c->SetPaused();
break;
case 'z':
if (ctrl)
{
c->HistoryRestore();
}
else
{
if (drawMode != DrawLine && !windTool)
isMouseDown = false;
zoomCursorFixed = false;
c->SetZoomEnabled(true);
}
break;
}
if (selectMode != SelectNone)
{
if (selectMode == PlaceSave)
{
switch (key)
{
case KEY_RIGHT:
case 'd':
@ -1330,75 +1396,14 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
break;
}
}
if(key != ' ' && key != 'z')
if (key != ' ' && key != 'z')
return;
}
switch(key)
{
case KEY_LALT:
case KEY_RALT:
drawSnap = true;
enableAltBehaviour();
break;
case KEY_LCTRL:
case KEY_RCTRL:
if(!isMouseDown)
{
if(drawModeReset)
drawModeReset = false;
else
drawPoint1 = currentMouse;
if(shift)
{
if (!toolBrush)
drawMode = DrawFill;
else
drawMode = DrawPoints;
}
else
drawMode = DrawRect;
}
enableCtrlBehaviour();
break;
case KEY_LSHIFT:
case KEY_RSHIFT:
if(!isMouseDown)
{
if(drawModeReset)
drawModeReset = false;
else
drawPoint1 = currentMouse;
if(ctrl)
{
if (!toolBrush)
drawMode = DrawFill;
else
drawMode = DrawPoints;
}
else
drawMode = DrawLine;
}
enableShiftBehaviour();
break;
case ' ': //Space
c->SetPaused();
break;
case KEY_TAB: //Tab
c->ChangeBrush();
break;
case 'z':
if (ctrl)
{
c->HistoryRestore();
}
else
{
if (drawMode != DrawLine && !windTool)
isMouseDown = false;
zoomCursorFixed = false;
c->SetZoomEnabled(true);
}
break;
case '`':
c->ShowConsole();
break;