Update to v4.0.0-rc.1

Finally it seems to be working! (Sorta)

Made all the class members that were private to public and this fixed
everything! I don't understand why I needed to do this; but I'm ready to
be done with v4.0.0

A few clean ups are in order as well as a few small bugs I need to iron
out but for the most part its working

Author: Patrick Rye

Source/entity.cpp

@@ -130,7 +130,7 @@ void clsEntity::nextplayer(void) {
 
 	//Records the last player into the array of players, and logs directions to file if that is enabled.
 	if (CnfgValues.blnLogging) {logFile = fopen(FileName,"a");} //Open log file in append mode.
-	if (Global::blnDebugMode) {printf("Player finished with fitness: %2.3f\n",plyPlayer.fitness); getchar(); }
+	if (Global::blnDebugMode) {printf("Player finished with fitness: %2.3f\n",plyPlayer.fitness); }
 
 	genPastPlayers[uchrPlayerNum].fitness = plyPlayer.fitness;
 	if (CnfgValues.blnLogging) {fprintf(logFile,"Generation: %2d, Player: %2d, Fitness: %2.2f",uchrGenNum,uchrPlayerNum + 1,plyPlayer.fitness);}
@@ -313,7 +313,7 @@ void clsEntity::setMonster(uchar num, MNSTR MonsterSet) {
 }
 /**********************************************************************************************************************************************/
 PLYR clsEntity::getPlayer(void) {
-	if(Global::blnDebugMode) {printf("Get Player's values, x = %d, y = %d, fitness = %3.2f, score = %d.\n",plyPlayer.location.x,plyPlayer.location.y,plyPlayer.fitness,plyPlayer.score);}
+	//if(Global::blnDebugMode) {printf("Get Player's values, x = %d, y = %d, fitness = %3.2f, score = %d.\n",plyPlayer.location.x,plyPlayer.location.y,plyPlayer.fitness,plyPlayer.score);}
 	return plyPlayer;
 }
 /**********************************************************************************************************************************************/

Source/entity.h

@@ -6,41 +6,42 @@
 #include <new>
 /**********************************************************************************************************************************************/
 class clsEntity {
-	private :
+	//private :
+	public:
 		//Functions
 		float getFitness(void);
 		void getBest(void);
 		void nextplayer(void);
 		void makeplayer(void);
-		
+
 		//Members
 		uint uintStepNum;
 		GEN genPastPlayers[DEFINED_PLAYERS_PER_GEN];
 		GEN genBestPlayers[DEFINED_BEST_PLAYER_NUM];
 		uint uintGenSteps;
 		const char* FileName = DEFINED_LOG_FILE_NAME;
 		FILE* logFile;
-		
+
 		PLYR plyPlayer;
 		MNSTR *pmstMonsters;
-		
-	public :
+
+	//public :
 		//Default Constructor
 		clsEntity();
 		~clsEntity();
-		
+
 		//Members
 		uchar uchrGenNum;
 		uchar uchrPlayerNum;
-		
+
 		//Functions
 		void start(void);
 		void killMonster(uchar,uchar);
 		void allocateMonsters(uchar);
-		
+
 		MNSTR getMonster(uchar);
 		void setMonster(uchar, MNSTR);
-		
+
 		PLYR getPlayer(void);
 		void setPlayer(LOC);
 };

Source/main.cpp

@@ -9,6 +9,12 @@
 #include "map.h"
 #include "entity.h"
 #include "globals.h"
+/**********************************************************************************************************************************************/
+//General Todos
+// TODO (Patrick.Rye#1#): Move class values back to being non public
+// TODO (Patrick#1#): Fitness is messed up (all of the place then shoots up really high)
+// TODO (Patrick#1#): Fitness seems to be decreasing even when Hard Mode is off
+
 /**********************************************************************************************************************************************/
 //Globals
 namespace Global {

Source/map.cpp

@@ -81,21 +81,21 @@ void clsMap::restart(void) {
 
 	MNSTR tempMonster;
 
-//	if (pmstBaseMonsters != nullptr) {
-//		for (uchar i = 0; i < numMonsters; i++) {
-//
-//            /* TODO (Patrick.Rye#1#08/20/15): Figure out why program crashes when accessing basemonster 0 */
-//			tempMonster.location.x = pmstBaseMonsters[i].location.x;
-//			tempMonster.location.y = pmstBaseMonsters[i].location.y;
-//			tempMonster.living = pmstBaseMonsters[i].living;
-//			tempMonster.movingright = pmstBaseMonsters[i].movingright;
-//
-//			Global::Enty.setMonster(i,tempMonster);
-//
-//			if (Global::blnDebugMode) {printf("Finished Monster %d.\n",i);}
-//		}
-//		if (Global::blnDebugMode) {printf("Base monsters placed.\n");}
-//	} else {if (Global::blnDebugMode) {printf("Base monsters equals nullptr.\n");}}
+	if (pmstBaseMonsters != nullptr) {
+		for (uchar i = 0; i < numMonsters; i++) {
+
+            /* TODO (Patrick.Rye#1#08/20/15): Figure out why program crashes when accessing basemonster 0 */
+			tempMonster.location.x = pmstBaseMonsters[i].location.x;
+			tempMonster.location.y = pmstBaseMonsters[i].location.y;
+			tempMonster.living = pmstBaseMonsters[i].living;
+			tempMonster.movingright = pmstBaseMonsters[i].movingright;
+
+			Global::Enty.setMonster(i,tempMonster);
+
+			if (Global::blnDebugMode) {printf("Finished Monster %d.\n",i);}
+		}
+		if (Global::blnDebugMode) {printf("Base monsters placed.\n");}
+	} else {if (Global::blnDebugMode) {printf("Base monsters equals nullptr.\n");}}
 
 	Global::Enty.setPlayer(locBasePlayer);
 
@@ -143,10 +143,8 @@ char clsMap::move(uchar direction) {
 	PLYR tempPlayer;
 	tempPlayer = Global::Enty.getPlayer();
 
-	if(Global::blnDebugMode) {printf("Temp Player's values, x = %d, y = %d, fitness = %3.2f, score = %d.\n",tempPlayer.location.x,tempPlayer.location.y,tempPlayer.fitness,tempPlayer.score); getchar();}
-
     /* TODO (Patrick.Rye#5#): Get rid of this line when I solve the issue of location being really high */
-	if (tempPlayer.location.x > DEFINED_MAP_WIDTH || tempPlayer.location.y > DEFINED_MAP_HEIGHT) {tempPlayer.location.x = 5; tempPlayer.location.y = 11;}
+	//if (tempPlayer.location.x > DEFINED_MAP_WIDTH || tempPlayer.location.y > DEFINED_MAP_HEIGHT) {tempPlayer.location.x = 5; tempPlayer.location.y = 11;}
 
 
 	tempx = tempPlayer.location.x;

Source/map.h

@@ -18,7 +18,8 @@ enum tile {
 };
 /**********************************************************************************************************************************************/
 class clsMap {
-	private:
+    public:
+	//private:
 		//Members
 		const uchar basemap[DEFINED_MAP_HEIGHT][DEFINED_MAP_WIDTH] = {{1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
 									{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -39,7 +40,7 @@ class clsMap {
 		LOC locBasePlayer; //The base player, which just holds the x and y values where they start.
 		MNSTR *pmstBaseMonsters;//the monsters on the map while restarting (see load if this is confusing)
 
-	public:
+	//public:
 		//Default Constructor
 		clsMap();
 		~clsMap();

Source/tick.h

@@ -6,13 +6,14 @@
 #include <cmath>
 /**********************************************************************************************************************************************/
 class clsTick {
-	private:
+    public:
+	//private:
 		//Members
 		uchar uchrFPS;
 		ulong ulngSleepTime;
 		uint uClock;
 
-	public:
+	//public:
 		//Default Constructor
 		clsTick();
 		~clsTick();

Source/version.h

@@ -18,17 +18,16 @@
 
 //Miscellaneous Version Types
 //Don't forget to increment the build number before each build
-#define DEFINED_VER_RC_FILEVERSION 4,0,0,136
-#define DEFINED_VER_RC_FILEVERSION_STRING "4, 0, 0, 136\0"
-#define DEFINED_VER_FULLVERSION_STRING  "4.0.0-beta.12"
+#define DEFINED_VER_RC_FILEVERSION 4,0,0,140
+#define DEFINED_VER_RC_FILEVERSION_STRING "4, 0, 0, 140\0"
+#define DEFINED_VER_FULLVERSION_STRING  "4.0.0-rc.1"
 
 //If this is not commented out then the build is meant to be a private build
 //as such it will be in debug mode.
 #define DEFINED_BUILD_MODE_PRIVATE
 
 //Software Status
-#define DEFINED_VER_STATUS  "Beta"
-#define DEFINED_VER_STATUS_SHORT  "b"
+#define DEFINED_VER_STATUS  "rc"
 
 
 #endif //__VERSION_HEADER__