Control Variables: Allow "0" as an item ID

Can be used to count how many slots are empty. Fix #3085
EasyRPG · Sep 13, 2023 · 6f06a33 · 6f06a33
1 parent f3a7f1d
commit 6f06a33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/game_actor.cpp b/src/game_actor.cpp
@@ -394,7 +394,9 @@ void Game_Actor::RemoveWholeEquipment() {
 int Game_Actor::GetItemCount(int item_id) {
 	int number = 0;
 
-	if (item_id > 0) {
+	// quirk: 0 is "no item in slot"
+	// This can be used to count how many slots are empty
+	if (item_id >= 0) {
 		for (int16_t i : GetWholeEquipment()) {
 			if (item_id == i) {
 				++number;

diff --git a/src/game_party.cpp b/src/game_party.cpp
@@ -145,7 +145,7 @@ int Game_Party::GetItemCount(int item_id) const {
 
 int Game_Party::GetEquippedItemCount(int item_id) const {
 	int number = 0;
-	if (item_id > 0) {
+	if (item_id >= 0) {
 		for (int i = 0; i < (int) data.party.size(); i++) {
 			Game_Actor* actor = Main_Data::game_actors->GetActor(data.party[i]);
 			number += actor->GetItemCount(item_id);