Move "ItemGained" message from battle scene to "game_message_terms.h"

Author: florianessl

src/game_message_terms.cpp

@@ -628,4 +628,21 @@ std::string GetGoldReceivedMessage(int money) {
 	return ss.str();
 }
 
+std::string GetItemReceivedMessage(const lcf::rpg::Item* item) {
+	// No Output::Warning needed here, reported later when the item is added
+	std::string_view item_name = item ? std::string_view(item->name) : std::string_view("??? BAD ITEM ???");
+
+	if (Feature::HasPlaceholders()) {
+		return Utils::ReplacePlaceholders(
+			lcf::Data::terms.item_recieved,
+			Utils::MakeArray('S'),
+			Utils::MakeSvArray(item_name)
+		);
+	}
+	std::string space = Player::IsRPG2k3E() ? " " : "";
+	std::stringstream ss;
+	ss << item_name << space << lcf::Data::terms.item_recieved;
+	return ss.str();
+}
+
 } // namespace PartyMessage

src/game_message_terms.h

@@ -131,6 +131,8 @@ std::string GetExperienceGainedMessage(int exp);
 
 std::string GetGoldReceivedMessage(int money);
 
+std::string GetItemReceivedMessage(const lcf::rpg::Item* item);
+
 } // namespace PartyMessage
 
 #endif

src/scene_battle_rpg2k.cpp

@@ -1961,27 +1961,11 @@ void Scene_Battle_Rpg2k::PushGoldReceivedMessage(PendingMessage& pm, int money)
 }
 
 void Scene_Battle_Rpg2k::PushItemRecievedMessages(PendingMessage& pm, std::vector<int> drops) {
-	std::stringstream ss;
-
 	for (std::vector<int>::iterator it = drops.begin(); it != drops.end(); ++it) {
 		const lcf::rpg::Item* item = lcf::ReaderUtil::GetElement(lcf::Data::items, *it);
-		// No Output::Warning needed here, reported later when the item is added
-		std::string_view item_name = item ? std::string_view(item->name) : std::string_view("??? BAD ITEM ???");
-
-		if (Feature::HasPlaceholders()) {
-			pm.PushLine(
-				Utils::ReplacePlaceholders(
-					lcf::Data::terms.item_recieved,
-					Utils::MakeArray('S'),
-					Utils::MakeSvArray(item_name)
-				) + Player::escape_symbol + "."
-			);
-		}
-		else {
-			ss.str("");
-			ss << item_name << lcf::Data::terms.item_recieved << Player::escape_symbol << ".";
-			pm.PushLine(ss.str());
-		}
+		pm.PushLine(
+			PartyMessage::GetItemReceivedMessage(item)
+			+ Player::escape_symbol + ".");
 	}
 }
 

src/scene_battle_rpg2k3.cpp

@@ -1856,7 +1856,6 @@ Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneActionVi
 
 		std::string space = Player::IsRPG2k3E() ? " " : "";
 
-		std::stringstream ss;
 		if (exp > 0) {
 			pm.PushLine(PartyMessage::GetExperienceGainedMessage(exp));
 			pm.PushPageEnd();
@@ -1867,12 +1866,7 @@ Scene_Battle_Rpg2k3::SceneActionReturn Scene_Battle_Rpg2k3::ProcessSceneActionVi
 		}
 		for (auto& item_id: drops) {
 			const lcf::rpg::Item* item = lcf::ReaderUtil::GetElement(lcf::Data::items, item_id);
-			// No Output::Warning needed here, reported later when the item is added
-			std::string_view item_name = item ? std::string_view(item->name) : std::string_view("??? BAD ITEM ???");
-
-			ss.str("");
-			ss << item_name << space << lcf::Data::terms.item_recieved;
-			pm.PushLine(ss.str());
+			pm.PushLine(PartyMessage::GetItemReceivedMessage(item));
 			pm.PushPageEnd();
 		}