KOTOR: Change Creature::createPC() to take a reference, not a pointer

It needs a CharacterGenerationInfo, which can't be 0.
xoreos · May 15, 2018 · 60e1a90 · 60e1a90
1 parent 1ee7c20
commit 60e1a90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/engines/kotor/creature.cpp b/src/engines/kotor/creature.cpp
@@ -317,16 +317,16 @@ void Creature::createFakePC() {
 	_isPC = true;
 }
 
-void Creature::createPC(const CharacterGenerationInfo *info) {
-	_name = info->getName();
+void Creature::createPC(const CharacterGenerationInfo &info) {
+	_name = info.getName();
 	_isPC = true;
 
 	PartModels parts;
 
 	parts.body = "p";
 	parts.head = "p";
 
-	switch (info->getGender()) {
+	switch (info.getGender()) {
 		case kGenderMale:
 			parts.body += "m";
 			parts.head += "m";
@@ -339,15 +339,15 @@ void Creature::createPC(const CharacterGenerationInfo *info) {
 			throw Common::Exception("Unknown gender");
 	}
 
-	_gender = info->getGender();
+	_gender = info.getGender();
 
 	_race = kRaceHuman;
 	_subRace = kSubRaceNone;
 
 	parts.body += "bb";
 	parts.head += "h";
 
-	switch (info->getClass()) {
+	switch (info.getClass()) {
 		case kClassSoldier:
 			parts.body += "l";
 			break;
@@ -363,11 +363,11 @@ void Creature::createPC(const CharacterGenerationInfo *info) {
 	// set the specific class to level 1
 	_levels.resize(1);
 	_levels[0].level = 1;
-	_levels[0].characterClass = info->getClass();
+	_levels[0].characterClass = info.getClass();
 
 	loadBody(parts);
 
-	switch (info->getSkin()) {
+	switch (info.getSkin()) {
 		case kSkinA:
 			parts.head += "a";
 			break;
@@ -381,7 +381,7 @@ void Creature::createPC(const CharacterGenerationInfo *info) {
 	}
 
 	parts.head += "0";
-	parts.head += Common::composeString(info->getFace() + 1);
+	parts.head += Common::composeString(info.getFace() + 1);
 
 	loadHead(parts);
 }

diff --git a/src/engines/kotor/creature.h b/src/engines/kotor/creature.h
@@ -52,7 +52,7 @@ class Creature : public Object {
 	/** Create a fake player character creature for testing purposes. */
 	void createFakePC();
 	/** Create a player character creature from a character info class. */
-	void createPC(const CharacterGenerationInfo *info);
+	void createPC(const CharacterGenerationInfo &info);
 
 	// Basic visuals
 

diff --git a/src/engines/kotor/gui/chargen/chargeninfo.cpp b/src/engines/kotor/gui/chargen/chargeninfo.cpp
@@ -166,7 +166,7 @@ void CharacterGenerationInfo::setFace(uint8 face) {
 
 Creature *CharacterGenerationInfo::getCharacter() const {
 	Creature *creature = new Creature();
-	creature->createPC(this);
+	creature->createPC(*this);
 	return creature;
 }