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 GameLogicScript use kInventorySlots. Make InvItem a read-only table. This means we do not need to write an enum directly in the Lua source.

Browse source
This commit is contained in:
hispidence 2021-07-13 13:21:13 +01:00
parent aa4f7f6526
commit a0ced5c34e
2 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -13,6 +13,7 @@
#include "pickup.h" #include "pickup.h"
#include "newinv2.h" #include "newinv2.h"
#include <iostream> #include <iostream>
#include "InventorySlots.h"
extern GameFlow* g_GameFlow; extern GameFlow* g_GameFlow;
GameScript* g_GameScript; GameScript* g_GameScript;
@ -29,6 +30,26 @@ 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);
// Put all the data in InvItem's metatable
m_lua->set("InvItemMeta", sol::as_table(kInventorySlots));
// Make the metatable's __index refer to itself so that requests
// to InvItem will go through to the metatable (and thus the
// kInventorySlot members)
m_lua->safe_script("InvItemMeta.__index = InvItemMeta");
// Don't allow InvItem to have new elements put into it
m_lua->safe_script("InvItemMeta.__newindex = function() error('InvItem is read-only') end");
// Protect the metatable
m_lua->safe_script("InvItemMeta.__metatable = 'metatable is protected'");
auto tab = m_lua->create_named_table("InvItem");
m_lua->safe_script("setmetatable(InvItem, InvItemMeta)");
// point InvItemMeta array from the table
m_lua->safe_script("InvItemMeta = nil");
GameScriptItemInfo::Register(m_lua); GameScriptItemInfo::Register(m_lua);
GameScriptPosition::Register(m_lua); GameScriptPosition::Register(m_lua);
GameScriptRotation::Register(m_lua); GameScriptRotation::Register(m_lua);
@ -311,26 +332,25 @@ void GameScript::Earthquake(int strength)
} }
// Inventory // Inventory
void GameScript::InventoryAdd(int slot, sol::optional<int> count) void GameScript::InventoryAdd(GAME_OBJECT_ID slot, sol::optional<int> count)
{ {
PickedUpObject(static_cast<GAME_OBJECT_ID>(inventry_objects_list[slot].object_number), count.value_or(0)); PickedUpObject(slot, count.value_or(0));
} }
void GameScript::InventoryRemove(int slot, sol::optional<int> count) void GameScript::InventoryRemove(GAME_OBJECT_ID slot, sol::optional<int> count)
{ {
RemoveObjectFromInventory(static_cast<GAME_OBJECT_ID>(inventry_objects_list[slot].object_number), count.value_or(0)); RemoveObjectFromInventory(static_cast<GAME_OBJECT_ID>(inventry_objects_list[slot].object_number), count.value_or(0));
} }
int GameScript::InventoryGetCount(int slot) int GameScript::InventoryGetCount(GAME_OBJECT_ID slot)
{ {
return GetInventoryCount(static_cast<GAME_OBJECT_ID>( inventry_objects_list[slot].object_number)); return GetInventoryCount(slot);
} }
void GameScript::InventorySetCount(int slot, int count) void GameScript::InventorySetCount(GAME_OBJECT_ID slot, int count)
{ {
auto result = static_cast<GAME_OBJECT_ID>( inventry_objects_list[slot].object_number );
// add the amount we'd need to add to get to count // add the amount we'd need to add to get to count
int currAmt = GetInventoryCount(result); int currAmt = GetInventoryCount(slot);
InventoryAdd(slot, count - currAmt); InventoryAdd(slot, count - currAmt);
} }

8
TR5Main/Scripting/GameLogicScript.h
View file

@ -96,10 +96,10 @@ public:
void Earthquake(int strength); void Earthquake(int strength);
// Inventory // Inventory
static void InventoryAdd(int slot, sol::optional<int> count); static void InventoryAdd(GAME_OBJECT_ID slot, sol::optional<int> count);
static void InventoryRemove(int slot, sol::optional<int> count); static void InventoryRemove(GAME_OBJECT_ID slot, sol::optional<int> count);
static int InventoryGetCount(int slot); static int InventoryGetCount(GAME_OBJECT_ID slot);
static void InventorySetCount(int slot, int count); static void InventorySetCount(GAME_OBJECT_ID slot, int count);
void InventoryCombine(int slot1, int slot2); void InventoryCombine(int slot1, int slot2);
void InventorySeparate(int slot); void InventorySeparate(int slot);