Correct orthograph of more classes.

Author: stephanemagnenat

libgag/include/SDLGraphicContext.h

@@ -328,7 +328,7 @@ namespace GAGCore
 		std::string appIcon;
 
 	public:
-		//! Constructor. Create a new window of size (w,h). If useGPU is true, use GPU for accelerated 2D (OpenGL or DX)
+		//! Constructor. Create a new window of size (w,h). If useGpu is true, use GPU for accelerated 2D (OpenGL or DX)
 		GraphicContext(int w, int h, Uint32 flags, const std::string title = "", const std::string icon = "");
 		//! Destructor
 		virtual ~GraphicContext(void);

src/BasePlayer.cpp

@@ -30,20 +30,20 @@ BasePlayer::BasePlayer()
 	init();
 };
 
-BasePlayer::BasePlayer(Sint32 number, const std::string& nname, Sint32 teamNumber, PlayerType type)
+BasePlayer::BasePlayer(Sint32 number, const std::string& name, Sint32 teamNumber, PlayerType type)
 {
 	init();
 
 	assert(number>=0);
 	assert(number<Team::MAX_COUNT);
 	assert(teamNumber>=0);
 	assert(teamNumber<Team::MAX_COUNT);
-	assert(nname.size());
+	assert(name.size());
 
 	setNumber(number);
 	setTeamNumber(teamNumber);
 
-	name=nname;
+	this->name=name;
 
 	this->type=type;
 };

src/BasePlayer.h

@@ -51,13 +51,13 @@ class BasePlayer
 		P_AI=5
 	};
 	//TODO: Explain
-	static AI::ImplementationID implementitionIdFromPlayerType(PlayerType type)
+	static AI::ImplementationID implementationIdFromPlayerType(PlayerType type)
 	{
 		assert(type>=P_AI);
 		return (AI::ImplementationID)((int)type-(int)P_AI);
 	}
 	//TODO: Explain
-	static PlayerType playerTypeFromImplementitionID(AI::ImplementationID iid)
+	static PlayerType playerTypeFromImplementationID(AI::ImplementationID iid)
 	{
 		return (PlayerType)((int)iid+(int)P_AI);
 	}
@@ -93,10 +93,10 @@ class BasePlayer
 	/**
       \param number
       \param name
-      \param teamn
+      \param teamNumber
       \param type
 	 */
-	BasePlayer(Sint32 number, const std::string& name, Sint32 teamn, PlayerType type);
+	BasePlayer(Sint32 number, const std::string& name, Sint32 teamNumber, PlayerType type);
 	//TODO: Explain
 	void init();
 	virtual ~BasePlayer(void);

src/BaseTeam.cpp

@@ -41,7 +41,7 @@ BaseTeam::BaseTeam()
 
 bool BaseTeam::load(GAGCore::InputStream *stream, Sint32 versionMinor)
 {
-	// loading baseteam
+	// loading base team
 	stream->readEnterSection("BaseTeam");
 	type = (TeamType)stream->readUint32("type");
 	teamNumber = stream->readSint32("teamNumber");
@@ -66,7 +66,7 @@ bool BaseTeam::load(GAGCore::InputStream *stream, Sint32 versionMinor)
 
 void BaseTeam::save(GAGCore::OutputStream *stream) const
 {
-	// saving baseteam
+	// saving base team
 	stream->writeEnterSection("BaseTeam");
 	stream->writeUint32((Uint32)type, "type");
 	stream->writeSint32(teamNumber, "teamNumber");

src/BaseTeam.h

@@ -45,7 +45,7 @@ class BaseTeam
 
 	TeamType type;
 	Sint32 teamNumber; // index of the current team in the game::teams[] array.
-	Sint32 numberOfPlayer; // number of controling players
+	Sint32 numberOfPlayer; // number of controlling players
 	GAGCore::Color color;
 	Uint32 playersMask;
 

src/BitArray.h

@@ -17,8 +17,8 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef __BITARRAY_H
-#define __BITARRAY_H
+#ifndef __BIT_ARRAY_H
+#define __BIT_ARRAY_H
 
 #include <valarray>
 

src/Building.cpp

@@ -507,7 +507,7 @@ void Building::saveCrossRef(GAGCore::OutputStream *stream)
 	stream->writeSint32(maxUnitInside, "maxUnitInside");
 	//TODO: std::list::size() is O(n). We should investigate
 	//if our intense use of this has an impact on overall performance.
-	//steph and nuage suggested to store and update size in a variable
+	//Stephane and nuage suggested to store and update size in a variable
 	//what is faster but also more error prone.
 	stream->writeUint32(unitsWorking.size(), "nbWorking");
 	fprintf(logFile, " nbWorking=%zd\n", unitsWorking.size());
@@ -2058,7 +2058,7 @@ void Building::turretStep(Uint32 stepCounter)
 		resources[STONE]--;
 		bullets += type->multiplierStoneToBullets;
 
-		// we need to be stone-feeded
+		// we need to be stone-fed
 		updateCallLists();
 	}
 
@@ -2085,16 +2085,16 @@ void Building::turretStep(Uint32 stepCounter)
 	assert(map);
 
 	// the type of target we have found
-	enum TargetType
+	enum class TargetType
 	{
-		TARGETTYPE_NONE,
-		TARGETTYPE_BUILDING,
-		TARGETTYPE_WORKER,
-		TARGETTYPE_WARRIOR,
-		TARGETTYPE_EXPLORER,
+		NONE,
+		BUILDING,
+		WORKER,
+		WARRIOR,
+		EXPLORER,
 	};
 	// The type of the best target we have found up to now
-	TargetType targetFound = TARGETTYPE_NONE;
+	TargetType targetFound = TargetType::NONE;
 	// The score of the best target we have found up to now
 	int bestScore = INT_MIN;
 	// The number of ticks before the unit may move away
@@ -2192,10 +2192,10 @@ void Building::turretStep(Uint32 stepCounter)
 									bestTicks = targetTicks;
 									bestTargetX = targetX;
 									bestTargetY = targetY;
-									targetFound = TARGETTYPE_WARRIOR;
+									targetFound = TargetType::WARRIOR;
 								}
 							}
-							else if ((targetFound != TARGETTYPE_WARRIOR) && (testUnit->typeNum == WORKER))
+							else if ((targetFound != TargetType::WARRIOR) && (testUnit->typeNum == WORKER))
 							{
 								// adjust score for range
 								int targetScore = - testUnit->hp;
@@ -2206,7 +2206,7 @@ void Building::turretStep(Uint32 stepCounter)
 									bestTicks = targetTicks;
 									bestTargetX = targetX;
 									bestTargetY = targetY;
-									targetFound = TARGETTYPE_WORKER;
+									targetFound = TargetType::WORKER;
 								}
 							}
 						}
@@ -2238,14 +2238,14 @@ void Building::turretStep(Uint32 stepCounter)
 								bestTicks = targetTicks;
 								bestTargetX = targetX;
 								bestTargetY = targetY;
-								targetFound = TARGETTYPE_EXPLORER;
+								targetFound = TargetType::EXPLORER;
 							}
 						}
 					}
 				}
 
 				// shoot building only if no unit is found
-				if (targetFound == TARGETTYPE_NONE)
+				if (targetFound == TargetType::NONE)
 				{
 					Uint16 targetGBID = map->getBuilding(targetX, targetY);
 					if (targetGBID != NOGBID)
@@ -2263,18 +2263,18 @@ void Building::turretStep(Uint32 stepCounter)
 								bestTicks = 256;
 								bestTargetX = targetX;
 								bestTargetY = targetY;
-								targetFound = TARGETTYPE_BUILDING;
+								targetFound = TargetType::BUILDING;
 							}
 						}
 					}
 				}
 			}
 		}
-		if (targetFound == TARGETTYPE_EXPLORER)
+		if (targetFound == TargetType::EXPLORER)
 			break;//specifying explorers as high priority
 	}
 
-	if (targetFound != TARGETTYPE_NONE)
+	if (targetFound != TargetType::NONE)
 	{
 		shootingStep = 0;
 

src/BuildingsTypes.cpp

@@ -42,14 +42,14 @@ void BuildingsTypes::checkIntegrity(void)
 		assert(bt);
 
 		//Need resource integrity:
-		bool needRessource=false;
+		bool needResource=false;
 		for (unsigned j=0; j<MAX_RESOURCES; j++)
 			if (bt->maxResource[j])
 			{
-				needRessource=true;
+				needResource=true;
 				break;
 			}
-		if (needRessource)
+		if (needResource)
 			assert(bt->fillable || bt->foodable);
 
 		//hpInc integrity:

src/BuildingsTypes.h

@@ -17,8 +17,8 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef __BULDING_TYPES_H
-#define __BULDING_TYPES_H
+#ifndef __BUILDING_TYPES_H
+#define __BUILDING_TYPES_H
 
 #include "BuildingType.h"
 

src/Campaign.cpp

@@ -100,9 +100,9 @@ bool CampaignMapEntry::isCompleted()
 
 
 
-void CampaignMapEntry::setCompleted(bool ncompleted)
+void CampaignMapEntry::setCompleted(bool completed)
 {
-	completed = ncompleted;
+	this->completed = completed;
 }
 
 
@@ -114,9 +114,9 @@ const std::string& CampaignMapEntry::getDescription() const
 
 
 
-void CampaignMapEntry::setDescription(const std::string& ndescription)
+void CampaignMapEntry::setDescription(const std::string& description)
 {
-	description=ndescription;
+	this->description=description;
 }
 
 
@@ -321,9 +321,9 @@ const std::string& Campaign::getPlayerName() const
 }
 
 
-void Campaign::setDescription(const std::string& ndescription)
+void Campaign::setDescription(const std::string& description)
 {
-	description = ndescription;
+	this->description = description;
 }