Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-10 12:36:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make GetItemByName take a const ref, and make its error print the name of the item that could not be found.

Browse source 
Register GetItemByName in GameLogicScript instead of winmain. Register GameScriptColor too.

Define the lambdas passed to GameScriptItemInfo in terms of the actual functions we define. Functions that make a GameScriptItemInfo should pass false to make_unique (so the Lua object made does not control the lifetime of the ITEM_INFO).
This commit is contained in:
hispidence 2021-07-20 17:58:11 +01:00
parent bf9bd13095
commit df11377a51
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -35,6 +35,8 @@ GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
m_lua->set_function("GetInvItemCount", &GameScript::InventoryGetCount); m_lua->set_function("GetInvItemCount", &GameScript::InventoryGetCount);
m_lua->set_function("SetInvItemCount", &GameScript::InventorySetCount); m_lua->set_function("SetInvItemCount", &GameScript::InventorySetCount);
m_lua->set_function("GetItemByName", &GameScript::GetItemByName, this);
m_lua->set_function("GetItemByID", &GameScript::GetItemById, this);
auto makeReadOnlyTable = [this](std::string const & tableName, auto const& container) auto makeReadOnlyTable = [this](std::string const & tableName, auto const& container)
{ {
auto mt = tableName + "Meta"; auto mt = tableName + "Meta";
@ -65,16 +67,17 @@ GameScript::GameScript(sol::state* lua) : LuaHandler{ lua }
GameScriptItemInfo::Register(m_lua); GameScriptItemInfo::Register(m_lua);
auto addLuaName = [this](std::string const& str, short num) auto addLuaName = [this](std::string const& str, short num)
{ {
return m_itemsMapName.insert(std::pair<std::string, short>(str, num)).second; return AddLuaName(str, num);
}; };
auto removeLuaName = [this](std::string const& str) auto removeLuaName = [this](std::string const& str)
{ {
return m_itemsMapName.erase(str); return RemoveLuaName(str);
}; };
GameScriptItemInfo::SetNameCallbacks(addLuaName, removeLuaName); GameScriptItemInfo::SetNameCallbacks(addLuaName, removeLuaName);
GameScriptPosition::Register(m_lua); GameScriptPosition::Register(m_lua);
GameScriptRotation::Register(m_lua); GameScriptRotation::Register(m_lua);
GameScriptColor::Register(m_lua);
m_lua->new_enum<GAME_OBJECT_ID>("Object", { m_lua->new_enum<GAME_OBJECT_ID>("Object", {
{"LARA", ID_LARA} {"LARA", ID_LARA}
@ -268,19 +271,23 @@ std::unique_ptr<GameScriptItemInfo> GameScript::GetItemById(int id)
return std::unique_ptr<GameScriptItemInfo>(nullptr); return std::unique_ptr<GameScriptItemInfo>(nullptr);
} }
return std::make_unique<GameScriptItemInfo>(m_itemsMapId[id]); return std::make_unique<GameScriptItemInfo>(m_itemsMapId[id], false);
} }
std::unique_ptr<GameScriptItemInfo> GameScript::GetItemByName(std::string name) std::unique_ptr<GameScriptItemInfo> GameScript::GetItemByName(std::string const & name)
{ {
if (m_itemsMapName.find(name) == m_itemsMapName.end()) if (m_itemsMapName.find(name) == m_itemsMapName.end())
{ {
if (WarningsAsErrors) if (WarningsAsErrors)
throw "item name not found"; {
std::string error{ "Item name not found: " };
error += name;
throw std::runtime_error{error};
}
return std::unique_ptr<GameScriptItemInfo>(nullptr); return std::unique_ptr<GameScriptItemInfo>(nullptr);
} }
return std::make_unique<GameScriptItemInfo>(m_itemsMapName[name]); return std::make_unique<GameScriptItemInfo>(m_itemsMapName[name], false);
} }
void GameScript::PlayAudioTrack(std::string const & trackName, bool looped) void GameScript::PlayAudioTrack(std::string const & trackName, bool looped)

2
TR5Main/Specific/winmain.cpp
View file

@ -229,8 +229,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
g_GameScript = new GameScript(&luaState); g_GameScript = new GameScript(&luaState);
luaState.set_function("GetItemByID", &GameScript::GetItemById, g_GameScript);
luaState.set_function("GetItemByName", &GameScript::GetItemByName, g_GameScript);
//luaState.set_function("CreatePosition", &GameScript::CreatePosition, g_GameScript); //luaState.set_function("CreatePosition", &GameScript::CreatePosition, g_GameScript);
//luaState.set_function("CreateRotation", &GameScript::CreateRotation, g_GameScript); //luaState.set_function("CreateRotation", &GameScript::CreateRotation, g_GameScript);
luaState.set_function("CalculateDistance", &GameScript::CalculateDistance, g_GameScript); luaState.set_function("CalculateDistance", &GameScript::CalculateDistance, g_GameScript);