KOTOR: Load creature movement rate based on appearance

xoreos · Jul 15, 2018 · ac52abf · ac52abf
1 parent ca3bae9
commit ac52abf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/engines/kotor/creature.cpp b/src/engines/kotor/creature.cpp
@@ -53,7 +53,10 @@ namespace Engines {
 
 namespace KotOR {
 
-Creature::Creature(const Aurora::GFF3Struct &creature) : Object(kObjectTypeCreature) {
+Creature::Creature(const Aurora::GFF3Struct &creature)
+		: Object(kObjectTypeCreature),
+		  _walkRate(0.0f),
+		  _runRate(0.0f) {
 	init();
 	load(creature);
 }
@@ -147,6 +150,14 @@ SubRace Creature::getSubRace() const {
 	return _subRace;
 }
 
+float Creature::getWalkRate() const {
+	return _walkRate;
+}
+
+float Creature::getRunRate() const {
+	return _runRate;
+}
+
 void Creature::setPosition(float x, float y, float z) {
 	Object::setPosition(x, y, z);
 	Object::getPosition(x, y, z);
@@ -321,6 +332,8 @@ void Creature::getPartModels(PartModels &parts, uint32 state) {
 		else if (headBackupID >= 0)
 			parts.head = heads.getRow(headBackupID).getString("head");
 	}
+
+	loadMovementRate(appearance.getString("moverate"));
 }
 
 void Creature::getPartModelsPC(PartModels &parts, uint32 state, uint8 textureVariation) {
@@ -412,6 +425,8 @@ void Creature::getPartModelsPC(PartModels &parts, uint32 state, uint8 textureVar
 	parts.head += Common::composeString(_face + 1);
 
 	parts.bodyTexture += Common::UString::format("%02u", textureVariation);
+
+	loadMovementRate("PLAYER");
 }
 
 void Creature::loadBody(PartModels &parts) {
@@ -445,6 +460,13 @@ void Creature::loadHead(PartModels &parts) {
 	_model->attachModel("headhook", _headModel);
 }
 
+void Creature::loadMovementRate(const Common::UString &name) {
+	const Aurora::TwoDARow &speed = TwoDAReg.get2DA("creaturespeed").getRow("2daname", name);
+
+	_walkRate = speed.getFloat("walkrate");
+	_runRate = speed.getFloat("runrate");
+}
+
 void Creature::changeBody() {
 	uint32 state = 'a';
 	uint8 textureVariation = 1;

diff --git a/src/engines/kotor/creature.h b/src/engines/kotor/creature.h
@@ -78,6 +78,9 @@ class Creature : public Object {
 	int getLevelByPosition(int position) const; ///< Get the level by its position in the level vector.
 	Class getClassByPosition(int position) const; ///< Get the class by its position in the level vector.
 
+	float getWalkRate() const;
+	float getRunRate() const;
+
 	// Positioning
 
 	/** Set the creature's position. */
@@ -173,6 +176,9 @@ class Creature : public Object {
 
 	std::vector<Action> _actionQueue;
 
+	float _walkRate;
+	float _runRate;
+
 
 	void init();
 
@@ -187,6 +193,8 @@ class Creature : public Object {
 	void getPartModelsPC(PartModels &parts, uint32 state, uint8 textureVariation);
 	void loadBody(PartModels &parts);
 	void loadHead(PartModels &parts);
+	void loadMovementRate(const Common::UString &name);
+
 	void changeBody();
 	void changeWeapon(EquipmentSlot slot);