mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 19:29:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw
2013-01-23 12:39:08 +00:00
parent da12cc6d46 07aade6c4c
commit 412e13a03e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/preview/PreviewView.cpp
View File

@@ -365,7 +365,7 @@ void PreviewView::OnMouseWheel(int x, int y, int d)
void PreviewView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt) void PreviewView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{ {
if ((key == KEY_ENTER || key == KEY_RETURN) && !addCommentBox->IsFocused()) if ((key == KEY_ENTER || key == KEY_RETURN) && (!addCommentBox || !addCommentBox->IsFocused()))
openButton->DoAction(); openButton->DoAction();
} }

2
src/simulation/elements/CRAY.cpp
View File

@@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0; HeatConduct = 0;
Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp2"; Description = "Particle Ray Emitter. Creates a beam of particles set by ctype, range is set by tmp";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_LIFE_DEC; Properties = TYPE_SOLID|PROP_LIFE_DEC;