Change reader_util include and improve warnings

src/background.cpp

@@ -52,7 +52,7 @@ Background::Background(int terrain_id) :
 	const RPG::Terrain* terrain = ReaderUtil::GetElement(Data::terrains, terrain_id);
 
 	if (!terrain) {
-		Output::Warning("Invalid terrain ID %d", terrain_id);
+		Output::Warning("Background: Invalid terrain ID %d", terrain_id);
 		return;
 	}
 

src/game_actor.cpp

@@ -18,14 +18,14 @@
 // Headers
 #include <algorithm>
 #include <sstream>
-#include <reader_util.h>
 #include "game_actor.h"
 #include "game_battle.h"
 #include "game_message.h"
 #include "game_party.h"
 #include "main_data.h"
 #include "output.h"
 #include "player.h"
+#include "reader_util.h"
 #include "rpg_skill.h"
 #include "util_macro.h"
 #include "utils.h"
@@ -85,7 +85,7 @@ int Game_Actor::GetId() const {
 bool Game_Actor::UseItem(int item_id) {
 	const RPG::Item* item = ReaderUtil::GetElement(Data::items, item_id);
 	if (!item) {
-		Output::Warning("Can't use invalid item %d", item_id);
+		Output::Warning("UseItem: Can't use invalid item %d", item_id);
 		return false;
 	}
 
@@ -114,7 +114,7 @@ bool Game_Actor::UseItem(int item_id) {
 bool Game_Actor::IsItemUsable(int item_id) const {
 	const RPG::Item* item = ReaderUtil::GetElement(Data::items, item_id);
 	if (!item) {
-		Output::Warning("Invalid item ID %d", item_id);
+		Output::Warning("IsItemUsable: Invalid item ID %d", item_id);
 		return false;
 	}
 
@@ -134,7 +134,7 @@ bool Game_Actor::IsSkillLearned(int skill_id) const {
 bool Game_Actor::IsSkillUsable(int skill_id) const {
 	const RPG::Skill* skill = ReaderUtil::GetElement(Data::skills, skill_id);
 	if (!skill) {
-		Output::Warning("Invalid skill ID %d", skill_id);
+		Output::Warning("IsSkillUsable: Invalid skill ID %d", skill_id);
 		return false;
 	}
 
@@ -234,7 +234,7 @@ int Game_Actor::SetEquipment(int equip_type, int new_item_id) {
 
 	const RPG::Item* new_item = ReaderUtil::GetElement(Data::items, new_item_id);
 	if (new_item_id != 0 && !new_item) {
-		Output::Warning("Can't equip item with invalid ID %d", new_item_id);
+		Output::Warning("SetEquipment: Can't equip item with invalid ID %d", new_item_id);
 		GetData().equipped[equip_type - 1] = 0;
 		return old_item_id;
 	}
@@ -552,7 +552,7 @@ int Game_Actor::GetAttributeModifier(int attribute_id) const {
 	const int* shift = ReaderUtil::GetElement(attribute_shift, attribute_id);
 
 	if (!shift) {
-		Output::Warning("Invalid attribute ID %d", attribute_id);
+		Output::Warning("GetAttributeModifier: Invalid attribute ID %d", attribute_id);
 		return 0;
 	}
 
@@ -771,7 +771,7 @@ void Game_Actor::ChangeLevel(int new_level, bool level_up_message) {
 bool Game_Actor::IsEquippable(int item_id) const {
 	const RPG::Item* item = ReaderUtil::GetElement(Data::items, item_id);
 	if (!item) {
-		Output::Warning("Invalid item ID %d", item_id);
+		Output::Warning("IsEquippable: Invalid item ID %d", item_id);
 		return false;
 	}
 
@@ -999,7 +999,7 @@ void Game_Actor::SetSprite(const std::string &file, int index, bool transparent)
 void Game_Actor::ChangeBattleCommands(bool add, int id) {
 	const RPG::BattleCommand* cmd = ReaderUtil::GetElement(Data::battlecommands.commands, id);
 	if (!cmd) {
-		Output::Warning("Can't add invalid battle command %d", id);
+		Output::Warning("ChangeBattleCommands: Can't add invalid battle command %d", id);
 		return;
 	}
 
@@ -1048,7 +1048,7 @@ const std::vector<const RPG::BattleCommand*> Game_Actor::GetBattleCommands() con
 
 				const RPG::BattleCommand* cmd = ReaderUtil::GetElement(Data::battlecommands.commands, bcmd_idx);
 				if (!cmd) {
-					Output::Warning("Invalid battle command ID %d", bcmd_idx);
+					Output::Warning("GetBattleCommands: Invalid battle command ID %d", bcmd_idx);
 					continue;
 				}
 
@@ -1057,7 +1057,7 @@ const std::vector<const RPG::BattleCommand*> Game_Actor::GetBattleCommands() con
 		} else {
 			const RPG::BattleCommand* cmd = ReaderUtil::GetElement(Data::battlecommands.commands, command_index);
 			if (!cmd) {
-				Output::Warning("Invalid battle command ID %d", command_index);
+				Output::Warning("GetBattleCommands: Invalid battle command ID %d", command_index);
 				continue;
 			}
 

src/game_actors.cpp

@@ -51,7 +51,7 @@ void Game_Actors::Dispose() {
 
 Game_Actor* Game_Actors::GetActor(int actor_id) {
 	if (!ActorExists(actor_id)) {
-		Output::Warning("Invalid actor ID %d", actor_id);
+		Output::Warning("GetActor: Invalid actor ID %d", actor_id);
 		return nullptr;
 	} else if (!data[actor_id])
 		data[actor_id].reset(new Game_Actor(actor_id));

src/game_battle.cpp

@@ -17,8 +17,6 @@
 
 #include <algorithm>
 #include <cassert>
-#include <deque>
-#include <reader_util.h>
 #include "data.h"
 #include "game_actors.h"
 #include "game_enemyparty.h"
@@ -31,6 +29,7 @@
 #include "game_interpreter_battle.h"
 #include "battle_animation.h"
 #include "game_battle.h"
+#include "reader_util.h"
 #include "spriteset_battle.h"
 #include "output.h"
 
@@ -86,7 +85,7 @@ void Game_Battle::Init() {
 
 	const RPG::Terrain* terrain = ReaderUtil::GetElement(Data::terrains, GetTerrainId());
 	if (!terrain) {
-		Output::Warning("Invalid battle terrain ID %d", GetTerrainId());
+		Output::Warning("Battle Init: Invalid battle terrain ID %d", GetTerrainId());
 	}
 }
 
@@ -157,7 +156,7 @@ void Game_Battle::ShowBattleAnimation(int animation_id, Game_Battler* target, bo
 
 	const RPG::Animation* anim = ReaderUtil::GetElement(Data::animations, animation_id);
 	if (!anim) {
-		Output::Warning("Invalid animation ID %d", animation_id);
+		Output::Warning("ShowBattleAnimation Single: Invalid animation ID %d", animation_id);
 		return;
 	}
 
@@ -169,7 +168,7 @@ void Game_Battle::ShowBattleAnimation(int animation_id, const std::vector<Game_B
 
 	const RPG::Animation* anim = ReaderUtil::GetElement(Data::animations, animation_id);
 	if (!anim) {
-		Output::Warning("Invalid animation ID %d", animation_id);
+		Output::Warning("ShowBattleAnimation Many: Invalid animation ID %d", animation_id);
 		return;
 	}
 

src/game_battlealgorithm.cpp

@@ -20,7 +20,6 @@
 #include <cstdlib>
 #include <algorithm>
 #include <sstream>
-#include <reader_util.h>
 #include "game_actor.h"
 #include "game_battle.h"
 #include "game_battlealgorithm.h"
@@ -34,6 +33,7 @@
 #include "main_data.h"
 #include "output.h"
 #include "player.h"
+#include "reader_util.h"
 #include "rpg_animation.h"
 #include "rpg_state.h"
 #include "rpg_skill.h"
@@ -742,12 +742,12 @@ bool Game_BattleAlgorithm::Normal::Execute() {
 			const RPG::Actor& actor = *ReaderUtil::GetElement(Data::actors, ally->GetId());
 			animation = ReaderUtil::GetElement(Data::animations, actor.unarmed_animation);
 			if (!animation) {
-				Output::Warning("Invalid unarmed animation ID %d", actor.unarmed_animation);
+				Output::Warning("Algorithm Normal: Invalid unarmed animation ID %d", actor.unarmed_animation);
 			}
 		} else {
 			animation = ReaderUtil::GetElement(Data::animations, weapon->animation_id);
 			if (!animation) {
-				Output::Warning("Invalid weapon animation ID %d", weapon->animation_id);
+				Output::Warning("Algorithm Normal: Invalid weapon animation ID %d", weapon->animation_id);
 			}
 
 			hit_chance = weapon->hit;
@@ -805,7 +805,7 @@ bool Game_BattleAlgorithm::Normal::Execute() {
 						if (weapon->state_set[i]) {
 							const RPG::State* state = ReaderUtil::GetElement(Data::states, weapon->state_set[i]);
 							if (!state) {
-								Output::Warning("Weapon %d causes invalid state %d", weapon->ID, weapon->state_set[i]);
+								Output::Warning("Algorithm Normal: Weapon %d causes invalid state %d", weapon->ID, weapon->state_set[i]);
 								continue;
 							}
 
@@ -928,7 +928,7 @@ bool Game_BattleAlgorithm::Skill::Execute() {
 	if (skill.animation_id != 0) {
 		animation = ReaderUtil::GetElement(Data::animations, skill.animation_id);
 		if (!animation) {
-			Output::Warning("Invalid skill animation ID %d", skill.animation_id);
+			Output::Warning("Algorithm Skill: Invalid skill animation ID %d", skill.animation_id);
 		}
 	}
 

src/game_battler.cpp

@@ -19,7 +19,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <reader_util.h>
 #include "player.h"
 #include "game_battler.h"
 #include "game_actor.h"
@@ -31,6 +30,7 @@
 #include "main_data.h"
 #include "utils.h"
 #include "output.h"
+#include "reader_util.h"
 
 Game_Battler::Game_Battler() {
 	ResetBattle();
@@ -113,7 +113,7 @@ int Game_Battler::GetStateRate(int state_id, int rate) const {
 	const RPG::State* state = ReaderUtil::GetElement(Data::states, state_id);
 
 	if (!state) {
-		Output::Warning("Invalid state ID %d", state_id);
+		Output::Warning("GetStateRate: Invalid state ID %d", state_id);
 		return 0;
 	}
 
@@ -139,7 +139,7 @@ int Game_Battler::GetAttributeRate(int attribute_id, int rate) const {
 	const RPG::Attribute* attribute = ReaderUtil::GetElement(Data::attributes, attribute_id);
 
 	if (!attribute) {
-		Output::Warning("Invalid attribute ID %d", attribute_id);
+		Output::Warning("GetAttributeRate: Invalid attribute ID %d", attribute_id);
 		return 0;
 	}
 
@@ -165,7 +165,7 @@ bool Game_Battler::IsSkillUsable(int skill_id) const {
 	const RPG::Skill* skill = ReaderUtil::GetElement(Data::skills, skill_id);
 
 	if (!skill) {
-		Output::Warning("Invalid skill ID %d", skill_id);
+		Output::Warning("IsSkillUsable: Invalid skill ID %d", skill_id);
 		return false;
 	}
 
@@ -205,7 +205,7 @@ bool Game_Battler::IsSkillUsable(int skill_id) const {
 bool Game_Battler::UseItem(int item_id) {
 	const RPG::Item* item = ReaderUtil::GetElement(Data::items, item_id);
 	if (!item) {
-		Output::Warning("Can't use item with invalid ID %d", item_id);
+		Output::Warning("UseItem: Can't use item with invalid ID %d", item_id);
 		return false;
 	}
 
@@ -272,7 +272,7 @@ bool Game_Battler::UseItem(int item_id) {
 bool Game_Battler::UseSkill(int skill_id) {
 	const RPG::Skill* skill = ReaderUtil::GetElement(Data::skills, skill_id);
 	if (!skill) {
-		Output::Warning("Can't use skill with invalid ID %d", skill_id);
+		Output::Warning("UseSkill: Can't use skill with invalid ID %d", skill_id);
 		return false;
 	}
 
@@ -323,7 +323,7 @@ bool Game_Battler::UseSkill(int skill_id) {
 int Game_Battler::CalculateSkillCost(int skill_id) const {
 	const RPG::Skill* skill = ReaderUtil::GetElement(Data::skills, skill_id);
 	if (!skill) {
-		Output::Warning("Invalid skill ID %d", skill_id);
+		Output::Warning("CalculateSkillCost: Invalid skill ID %d", skill_id);
 		return 0;
 	}
 
@@ -352,7 +352,7 @@ void Game_Battler::SetAgiModifier(int modifier) {
 void Game_Battler::AddState(int state_id) {
 	const RPG::State* state = ReaderUtil::GetElement(Data::states, state_id);
 	if (!state) {
-		Output::Warning("Can't add state with invalid ID %d", state_id);
+		Output::Warning("AddState: Can't add state with invalid ID %d", state_id);
 		return;
 	}
 
@@ -367,7 +367,7 @@ void Game_Battler::AddState(int state_id) {
 void Game_Battler::RemoveState(int state_id) {
 	const RPG::State* state = ReaderUtil::GetElement(Data::states, state_id);
 	if (!state) {
-		Output::Warning("Can't delete state with invalid ID %d", state_id);
+		Output::Warning("RemoveState: Can't delete state with invalid ID %d", state_id);
 		return;
 	}
 

src/game_commonevent.cpp

@@ -16,12 +16,12 @@
  */
 
 // Headers
-#include <reader_util.h>
 #include "game_commonevent.h"
 #include "game_map.h"
 #include "game_switches.h"
 #include "game_interpreter_map.h"
 #include "main_data.h"
+#include "reader_util.h"
 
 Game_CommonEvent::Game_CommonEvent(int common_event_id) :
 	common_event_id(common_event_id) {

src/game_enemy.cpp

@@ -17,13 +17,13 @@
 
 // Headers
 #include <algorithm>
-#include <reader_util.h>
 #include "data.h"
 #include "rpg_enemy.h"
 #include "game_battle.h"
 #include "game_enemy.h"
 #include "game_party.h"
 #include "game_switches.h"
+#include "reader_util.h"
 #include "output.h"
 #include "utils.h"
 

src/game_enemyparty.cpp

@@ -17,10 +17,10 @@
 
 // Headers
 #include <cassert>
-#include <reader_util.h>
 #include "game_interpreter.h"
 #include "game_enemyparty.h"
 #include "main_data.h"
+#include "reader_util.h"
 #include "utils.h"
 #include "output.h"
 

src/game_interpreter_battle.cpp

@@ -16,7 +16,6 @@
  */
 
 // Headers
-#include <reader_util.h>
 #include "game_actors.h"
 #include "game_battle.h"
 #include "game_enemyparty.h"
@@ -25,6 +24,7 @@
 #include "game_switches.h"
 #include "game_system.h"
 #include "game_variables.h"
+#include "reader_util.h"
 #include "output.h"
 #include "player.h"
 #include "game_temp.h"