From d379390d066add46513da73a690ef20414b6627b Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Wed, 5 Sep 2012 17:02:03 +0100
Subject: Newtonian gravity field info in HUD (Maybe we could have an arrow to
 show direction in future). Fixed #152


diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index e083251..8c4954f 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -290,9 +290,9 @@ void GameModel::BuildMenus()
 	brushList.push_back(new TriangleBrush(ui::Point(4, 4)));
 
 	//Set default tools
-	activeTools[0] = GetToolFromIdentifier("DEFAULT_PT_DUST");//menuList[SC_POWDERS]->GetToolList()[0];
-	activeTools[1] = GetToolFromIdentifier("DEFAULT_UI_SAMPLE");//menuList[SC_SPECIAL]->GetToolList()[0];
-	activeTools[2] = GetToolFromIdentifier("DEFAULT_PT_NONE");//menuList[SC_TOOL]->GetToolList()[0];
+	activeTools[0] = GetToolFromIdentifier("DEFAULT_PT_DUST");
+	activeTools[2] = GetToolFromIdentifier("DEFAULT_PT_NONE");
+	activeTools[1] = GetToolFromIdentifier("DEFAULT_UI_SAMPLE");
 
 	if(activeToolIdentifiers[0].length())
 		activeTools[0] = GetToolFromIdentifier(activeToolIdentifiers[0]);
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 8b7ee2e..3955c67 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -2004,6 +2004,8 @@ void GameView::OnDraw()
 				sampleInfo << "#" << sample.ParticleID << ", ";
 			}
 			sampleInfo << "X:" << sample.PositionX << " Y:" << sample.PositionY;
+			if (std::abs(sample.Gravity) > 0.1f)
+				sampleInfo << " GX: " << sample.GravityVelocityX << " GY: " << sample.GravityVelocityY;
 
 			textWidth = Graphics::textwidth((char*)sampleInfo.str().c_str());
 			g->fillrect(XRES-20-textWidth, 26, textWidth+8, 15, 0, 0, 0, 255*0.5);
--
cgit v0.9.2-21-gd62e