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

6 files changed, 19 insertions, 13 deletions

diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp
index 676eec8..27b7b84 100644
--- a/src/gui/game/GameView.cpp
+++ b/src/gui/game/GameView.cpp
@@ -1312,7 +1312,10 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		screenshot();
 		break;
 	case 'r':
-		record();
+		if (ctrl)
+			c->ReloadSim();
+		else
+			record();
 		break;
 	case 'e':
 		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)
 {
-	if(ctrl && shift)
+	if(ctrl && shift && drawMode != DrawPoints)
 		drawMode = DrawFill;
-	else if (ctrl)
+	else if (ctrl && drawMode != DrawPoints)
 		drawMode = DrawRect;
-	else if (shift)
+	else if (shift && drawMode != DrawPoints)
 		drawMode = DrawLine;
 	else if(!isMouseDown)
 		drawMode = DrawPoints;
@@ -1878,7 +1881,7 @@ void GameView::OnDraw()
 
 					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
@@ -1949,7 +1952,7 @@ void GameView::OnDraw()
 			for(iter = logEntries.begin(); iter != logEntries.end() && startAlpha>0; 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->drawtext(startX, startY, message.c_str(), 255, 255, 255, startAlpha);
 				startAlpha-=14;
diff --git a/src/gui/save/ServerSaveActivity.cpp b/src/gui/save/ServerSaveActivity.cpp
index 1d99f74..c26fd08 100644
--- a/src/gui/save/ServerSaveActivity.cpp
+++ b/src/gui/save/ServerSaveActivity.cpp
@@ -259,13 +259,13 @@ void ServerSaveActivity::ShowRules()
 		   "- This includes vote signs in the game, drawings of vote arrows, and comments on the save telling people to vote up.\n"
 		   "- Gimmicks for getting votes like '100 votes and I'll make a better version' are similarly frowned upon.\n"
 		"\bt6. Keep the number of logos and signs to a minimum.\bw They not only slow the game down, but it can also make saves unappealing for people to use. \n"
-		   "- Please do not make fake update or similar update signs either.\n"
+		   "- Please do not make fake update or similar fake signs either.\n"
 		"\bt7. Please don't swear excessively.\bw Saves containing excessive swearing or rude language will be unpublished. Don't make rude or offensive comments either.\n"
 		"\bt8. Don't make text only saves.\bw Saves are much better when they actually use some of the features in the game. Text only saves will be removed from the front page should they ever get there.\n"
 		   "- Also, element suggestion saves will be removed from the front page. It's recommended you make a thread on the forum instead so you can get actual criticism from other users and devs.\n"
 		   "- This is also related to art on the front page. Art saves that only rely on the deco layer are generally removed. Art using elements may stay longer if it's more impressive.\n"
 		"\bt9. Don't claim others' work as your own.\bw If you didn't make it, don't resave it for yourself. You can fav. a save instead of publishing a copy if you want to see it later.\n"
-		   "- This doesn't mean you can't modify or improve saves; building on the works of others in encouraged. If you give credit to the original author, it is usually OK to resave unless the author specifically prohibits it.\n"
+		   "- This doesn't mean you can't modify or improve saves; building on the works of others is encouraged. If you give credit to the original author, it is usually OK to resave unless the author specifically prohibits it.\n"
 		"\bt10. Do not make laggy saves.\bw If a save is so laggy that it crashes the game for some people, it's just really annoying. Saves that do make it to the front page that purposely lag the game will be demoted.\n"
 		"\n"
 		"You can report a save breaking any one of these rules, as the moderators are busy in real life too and don't always have the time to search through all saves for these kinds of things. If reporting a copied save, just give the ID of the original, but if not an ID isn't needed.";
@@ -311,4 +311,4 @@ ServerSaveActivity::~ServerSaveActivity()
 		delete callback;
 	if(thumbnail)
 		delete thumbnail;
-}
\ No newline at end of file
+}
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index c738fce..499748d 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4001,6 +4001,9 @@ void Simulation::update_particles_i(int start, int inc)
 							if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) {
 								if (parts[i].ctype==PT_THRM&&pt>=elements[PT_BMTL].HighTemperature) s = 0;
 								else if ((parts[i].ctype==PT_VIBR || parts[i].ctype==PT_BVBR) && pt>=273.15f) s = 0;
+								else if (parts[i].ctype==PT_TUGN) {
+									if (pt>3695.0) s = 0;
+								}
 								else if (elements[parts[i].ctype].HighTemperatureTransition==PT_LAVA) {
 									if (pt>=elements[parts[i].ctype].HighTemperature) s = 0;
 								}
diff --git a/src/simulation/elements/LAVA.cpp b/src/simulation/elements/LAVA.cpp
index 062dcf8..b52c61e 100644
--- a/src/simulation/elements/LAVA.cpp
+++ b/src/simulation/elements/LAVA.cpp
@@ -37,7 +37,7 @@ Element_LAVA::Element_LAVA()
 	LowPressureTransition = NT;
 	HighPressure = IPH;
 	HighPressureTransition = NT;
-	LowTemperature = 2573.15f;
+	LowTemperature = 3695.0f;// Highest temperature at which any type of lava can solidify
 	LowTemperatureTransition = ST;
 	HighTemperature = ITH;
 	HighTemperatureTransition = NT;
@@ -68,4 +68,4 @@ int Element_LAVA::graphics(GRAPHICS_FUNC_ARGS)
 }
 
 
-Element_LAVA::~Element_LAVA() {}
\ No newline at end of file
+Element_LAVA::~Element_LAVA() {}
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index 4da1b73..35a470d 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -185,7 +185,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
 			if(spaces >= amount)
 				break;
 		} else {
-			if(currentPos < maxSize && !retract)
+			if(spaces < maxSize && !retract)
 				tempParts[currentPos++] = r>>8;
 			else
 				return spaces;
diff --git a/src/simulation/elements/TUGN.cpp b/src/simulation/elements/TUGN.cpp
index 2c2c236..f70037b 100644
--- a/src/simulation/elements/TUGN.cpp
+++ b/src/simulation/elements/TUGN.cpp
@@ -40,7 +40,7 @@ Element_TUGN::Element_TUGN()
 	HighPressureTransition = NT;
 	LowTemperature = ITL;
 	LowTemperatureTransition = NT;
-	HighTemperature = ITL;
+	HighTemperature = ITH;
 	HighTemperatureTransition = NT;
 	/*HighTemperature = 3895.0f;
 	HighTemperatureTransition = PT_LAVA;*/