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

ctrl+r reload shortcut, fix a few brush drawing bugs, fix stamp xor area, fix lua log text overlaps

Browse Source
This commit is contained in:
jacob1 2013-05-04 11:52:37 -04:00
parent b0f14e0c54
commit f93a70edfb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1312,7 +1312,10 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
screenshot(); screenshot();
break; break;
case 'r': case 'r':
record(); if (ctrl)
c->ReloadSim();
else
record();
break; break;
case 'e': case 'e':
c->OpenElementSearch(); c->OpenElementSearch();
@ -1442,11 +1445,11 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt) void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{ {
if(ctrl && shift) if(ctrl && shift && drawMode != DrawPoints)
drawMode = DrawFill; drawMode = DrawFill;
else if (ctrl) else if (ctrl && drawMode != DrawPoints)
drawMode = DrawRect; drawMode = DrawRect;
else if (shift) else if (shift && drawMode != DrawPoints)
drawMode = DrawLine; drawMode = DrawLine;
else if(!isMouseDown) else if(!isMouseDown)
drawMode = DrawPoints; drawMode = DrawPoints;
@ -1878,7 +1881,7 @@ void GameView::OnDraw()
ren->draw_image(placeSaveThumb, thumbPos.X, thumbPos.Y, 128); ren->draw_image(placeSaveThumb, thumbPos.X, thumbPos.Y, 128);
ren->xor_rect(thumbPos.X, thumbPos.Y, placeSaveThumb->Width, placeSaveThumb->Width); ren->xor_rect(thumbPos.X, thumbPos.Y, placeSaveThumb->Width, placeSaveThumb->Height);
} }
} }
else else
@ -1949,7 +1952,7 @@ void GameView::OnDraw()
for(iter = logEntries.begin(); iter != logEntries.end() && startAlpha>0; iter++) for(iter = logEntries.begin(); iter != logEntries.end() && startAlpha>0; iter++)
{ {
string message = (*iter); string message = (*iter);
startY -= 13; startY -= 14;
g->fillrect(startX-3, startY-3, Graphics::textwidth((char*)message.c_str())+6, 14, 0, 0, 0, 100); g->fillrect(startX-3, startY-3, Graphics::textwidth((char*)message.c_str())+6, 14, 0, 0, 0, 100);
g->drawtext(startX, startY, message.c_str(), 255, 255, 255, startAlpha); g->drawtext(startX, startY, message.c_str(), 255, 255, 255, startAlpha);
startAlpha-=14; startAlpha-=14;