KOTOR: Enforce const-correctness in the character generator more

xoreos · May 15, 2018 · 1ee7c20 · 1ee7c20
1 parent a914c12
commit 1ee7c20
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/engines/kotor/creature.cpp b/src/engines/kotor/creature.cpp
@@ -317,7 +317,7 @@ void Creature::createFakePC() {
 	_isPC = true;
 }
 
-void Creature::createPC(CharacterGenerationInfo *info) {
+void Creature::createPC(const CharacterGenerationInfo *info) {
 	_name = info->getName();
 	_isPC = true;
 

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(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
@@ -99,11 +99,11 @@ CharacterGenerationInfo *CharacterGenerationInfo::createRandomFemaleScoundrel()
 	return info;
 }
 
-const Common::UString &CharacterGenerationInfo::getName() {
+const Common::UString &CharacterGenerationInfo::getName() const {
 	return _name;
 }
 
-Common::UString CharacterGenerationInfo::getPortrait() {
+Common::UString CharacterGenerationInfo::getPortrait() const {
 	Common::UString portrait = "po_p";
 
 	switch (_gender) {
@@ -136,19 +136,19 @@ Common::UString CharacterGenerationInfo::getPortrait() {
 	return portrait;
 }
 
-Skin CharacterGenerationInfo::getSkin() {
+Skin CharacterGenerationInfo::getSkin() const {
 	return _skin;
 }
 
-uint8_t CharacterGenerationInfo::getFace() {
+uint8_t CharacterGenerationInfo::getFace() const {
 	return _face;
 }
 
-Class CharacterGenerationInfo::getClass() {
+Class CharacterGenerationInfo::getClass() const {
 	return _class;
 }
 
-Gender CharacterGenerationInfo::getGender() {
+Gender CharacterGenerationInfo::getGender() const {
 	return _gender;
 }
 
@@ -164,7 +164,7 @@ void CharacterGenerationInfo::setFace(uint8 face) {
 	_face = face;
 }
 
-Creature *CharacterGenerationInfo::getCharacter() {
+Creature *CharacterGenerationInfo::getCharacter() const {
 	Creature *creature = new Creature();
 	creature->createPC(this);
 	return creature;

diff --git a/src/engines/kotor/gui/chargen/chargeninfo.h b/src/engines/kotor/gui/chargen/chargeninfo.h
@@ -53,17 +53,17 @@ class CharacterGenerationInfo {
 	static CharacterGenerationInfo *createRandomFemaleScoundrel();
 
 	/** Get the name of the character. */
-	const Common::UString &getName();
+	const Common::UString &getName() const;
 	/** Get the name of the portrait of this character. */
-	Common::UString getPortrait();
+	Common::UString getPortrait() const;
 	/** Get the skin type of the character. */
-	Skin getSkin();
+	Skin getSkin() const;
 	/** Get the current face index of the character. */
-	uint8_t getFace();
+	uint8_t getFace() const;
 	/** Get the class of the character, defined in types.h. */
-	Class getClass();
+	Class getClass() const;
 	/** Get the gender of the Character. */
-	Gender getGender();
+	Gender getGender() const;
 
 	/** Set the name of the Character. */
 	void setName(const Common::UString &name);
@@ -72,7 +72,7 @@ class CharacterGenerationInfo {
 	/** Set the face index of the character. */
 	void setFace(uint8 face);
 
-	Creature *getCharacter();
+	Creature *getCharacter() const;
 	Graphics::Aurora::Model *getModel();
 
 private: