CharacterPicker: Fixed incorrect Pet indexing

CircuitMess · Sep 9, 2024 · 10f9646 · 10f9646
1 parent 2ad0150
commit 10f9646
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/main/src/Screens/Profile/CharacterPicker.cpp b/main/src/Screens/Profile/CharacterPicker.cpp
@@ -14,7 +14,6 @@ static void VerticalAnimCB(void* obj, int32_t v){
 }
 
 CharacterPicker::CharacterPicker(lv_obj_t* parent) : LVObject(parent), settings(*(Settings*) Services.get(Service::Settings)){
-	petIndex = settings.get().pet;
 	avatarIndex = settings.get().avatar;
 	level = ((XPSystem*) Services.get(Service::XPSystem))->getLevel();
 
@@ -25,6 +24,16 @@ CharacterPicker::CharacterPicker(lv_obj_t* parent) : LVObject(parent), settings(
 		}
 	}
 
+	const auto selectedPet = settings.get().pet;
+	petIndex = selectedPet;
+	if(selectedPet != -1){
+		for(uint8_t i = 0; i < unlockedPets.size(); ++i){
+			if(selectedPet == (uint8_t)unlockedPets[i]){
+				petIndex = i;
+			}
+		}
+	}
+
 	buildUI();
 	initArrowAnim();
 

diff --git a/main/src/Screens/Profile/CharacterPicker.h b/main/src/Screens/Profile/CharacterPicker.h
@@ -21,7 +21,7 @@ class CharacterPicker : public LVObject {
 
 private:
 	uint8_t avatarIndex = 0;
-	int8_t petIndex = 0;
+	int8_t petIndex = -1;
 	std::vector<Pet> unlockedPets;
 	uint8_t level = 0;