oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Dehardcode the death formspec (#15155)

Browse source 
Co-authored-by: Paul Ouellette <oue.paul18@gmail.com>
This commit is contained in:
grorp 2024-09-24 22:37:44 +02:00 • committed by GitHub
parent 3c48671076
commit 526a2f7b8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
79 changed files with 242 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/script/cpp_api/s_client.cpp
View file

@ -125,21 +125,6 @@ void ScriptApiClient::on_hp_modification(int32_t newhp)
}
}
void ScriptApiClient::on_death()
{
SCRIPTAPI_PRECHECKHEADER
// Get registered shutdown hooks
lua_getglobal(L, "core");
lua_getfield(L, -1, "registered_on_death");
// Call callbacks
try {
runCallbacks(0, RUN_CALLBACKS_MODE_FIRST);
} catch (LuaError &e) {
getClient()->setFatalError(e);
}
}
void ScriptApiClient::environment_step(float dtime)
{
SCRIPTAPI_PRECHECKHEADER

1
src/script/cpp_api/s_client.h
View file

@ -49,7 +49,6 @@ public:
void on_damage_taken(int32_t damage_amount);
void on_hp_modification(int32_t newhp);
void on_death();
void environment_step(float dtime);
void on_formspec_input(const std::string &formname, const StringMap &fields);

8
src/script/lua_api/l_client.cpp
View file

@ -157,13 +157,6 @@ int ModApiClient::l_show_formspec(lua_State *L)
return 1;
}
// send_respawn()
int ModApiClient::l_send_respawn(lua_State *L)
{
getClient(L)->sendRespawn();
return 0;
}
// disconnect()
int ModApiClient::l_disconnect(lua_State *L)
{
@ -348,7 +341,6 @@ void ModApiClient::Initialize(lua_State *L, int top)
API_FCT(clear_out_chat_queue);
API_FCT(get_player_names);
API_FCT(show_formspec);
API_FCT(send_respawn);
API_FCT(gettext);
API_FCT(get_node_or_nil);
API_FCT(disconnect);

3
src/script/lua_api/l_client.h
View file

@ -51,9 +51,6 @@ private:
// show_formspec(name, formspec)
static int l_show_formspec(lua_State *L);
// send_respawn()
static int l_send_respawn(lua_State *L);
// disconnect()
static int l_disconnect(lua_State *L);

6
src/script/lua_api/l_object.cpp
View file

@ -2693,11 +2693,11 @@ int ObjectRef::l_respawn(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkObject<ObjectRef>(L, 1);
RemotePlayer *player = getplayer(ref);
if (player == nullptr)
auto *psao = getplayersao(ref);
if (psao == nullptr)
return 0;
getServer(L)->RespawnPlayer(player->getPeerId());
psao->respawn();
lua_pushboolean(L, true);
return 1;
}