Update to v1.2.1-Beta

17 September 2015
   Released version 1.2.1-Beta

     Change log:

-Fixed: An issue with mass not being set causing values to being NaN, if
drag was not enabled

Author: Patrick Rye

ChangesLog.txt

@@ -1,3 +1,9 @@
+17 September 2015
+   Released version 1.2.1-Beta
+
+     Change log:
+        -Fixed: An issue with mass not being set causing values to being NaN, if drag was not enabled
+
 17 September 2015
    Released version 1.2.0-Beta
 

src/cannonball.cpp

@@ -29,7 +29,6 @@ clsCannonball::clsCannonball() {
 /**********************************************************************************************************************************************/
 void clsCannonball::enableDrag(void) {
     blnDragEnabled = true;
-    Drag_calcvalues();
     if (Global::blnDebugMode) {printf("Drag enabled.\n");}
 }
 /**********************************************************************************************************************************************/
@@ -117,7 +116,7 @@ void clsCannonball::update(double newdeltat) {
     if (total_v < Global::Physics::fMinVelocity || isnan(total_v) ) {
         blnstarted = false;
         if (Global::blnDebugMode) {
-            if ( isnan(total_v) ) {printf("Ball vel is Nan; killing it\n");}
+            if ( isnan(total_v) ) {printf("Ball vel is NaN; killing it\n");}
             else {printf("Ball moving too slow; killing it\n");}
         } //end if debug mode
     } //end if should kill
@@ -139,7 +138,6 @@ void clsCannonball::show() {
 /**********************************************************************************************************************************************/
 void clsCannonball::setValues(double r, LOC init_place, double init_vel, double init_angle, uint ID) {
     props.radius = r; //in meters
-    props.density = Global::Physics::uBallDensity; //density of steel in kg/m^3
 
     acc.x = 0.00;
     acc.y = Global::Physics::fGravity;
@@ -154,7 +152,7 @@ void clsCannonball::setValues(double r, LOC init_place, double init_vel, double
 	ballID = ID;
 	blnstarted = true;
 
-
+    Drag_calcvalues();
 	if (Global::Config.values.blnDragMode) { enableDrag(); }
 }
 /**********************************************************************************************************************************************/

src/version.h

@@ -14,17 +14,17 @@
 	//Standard Version Type
 	#define DEFINED_VER_MAJOR  1
 	#define DEFINED_VER_MINOR  2
-	#define DEFINED_VER_BUILD  0
-	#define DEFINED_VER_REVISION  2
+	#define DEFINED_VER_BUILD  1
+	#define DEFINED_VER_REVISION  58
 
 	//Miscellaneous Version Types
-	#define DEFINED_VER_BUILDS_COUNT  50
-	#define DEFINED_VER_RC_FILEVERSION 1,2,0,2
-	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 2, 0, 2\0"
-	#define DEFINED_VER_FULLVERSION_STRING  "1.2.0.2"
+	#define DEFINED_VER_BUILDS_COUNT  8
+	#define DEFINED_VER_RC_FILEVERSION 1,2,1,58
+	#define DEFINED_VER_RC_FILEVERSION_STRING "1, 2, 1, 58\0"
+	#define DEFINED_VER_FULLVERSION_STRING  "1.2.1.58"
 
 	//These values are to keep track of your versioning state, don't modify them.
-	#define DEFINED_VER_BUILD_HISTORY  2
+	#define DEFINED_VER_BUILD_HISTORY  1
 
 
 #endif //__VERSION_HEADER__