luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 17:35:37 +02:00
Code Activity

Switch player names to std::string

Browse Source
This commit is contained in:
Lars Mueller
2023-11-12 15:25:46 +01:00
committed by sfan5
parent 603eb57943
commit cc8e7a569e
18 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/cpp_api/s_server.cpp
View File

@@ -246,7 +246,7 @@ void ScriptApiServer::freeDynamicMediaCallback(u32 token)
lua_pop(L, 2);
}
void ScriptApiServer::on_dynamic_media_added(u32 token, const char *playername)
void ScriptApiServer::on_dynamic_media_added(u32 token, const std::string &playername)
{
SCRIPTAPI_PRECHECKHEADER
@@ -257,6 +257,6 @@ void ScriptApiServer::on_dynamic_media_added(u32 token, const char *playername)
lua_rawgeti(L, -1, token);
luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushstring(L, playername);
lua_pushstring(L, playername.c_str());
PCALL_RES(lua_pcall(L, 1, 0, error_handler));
}

2
src/script/cpp_api/s_server.h
View File

@@ -53,7 +53,7 @@ public:
/* dynamic media handling */
static u32 allocateDynamicMediaCallback(lua_State *L, int f_idx);
void freeDynamicMediaCallback(u32 token);
void on_dynamic_media_added(u32 token, const char *playername);
void on_dynamic_media_added(u32 token, const std::string &playername);
private:
void getAuthHandler();

2
src/script/lua_api/l_localplayer.cpp
View File

@@ -72,7 +72,7 @@ int LuaLocalPlayer::l_get_name(lua_State *L)
{
LocalPlayer *player = getobject(L, 1);
lua_pushstring(L, player->getName());
lua_pushstring(L, player->getName().c_str());
return 1;
}

2
src/script/lua_api/l_object.cpp
View File

@@ -1166,7 +1166,7 @@ int ObjectRef::l_get_player_name(lua_State *L)
return 1;
}
lua_pushstring(L, player->getName());
lua_pushstring(L, player->getName().c_str());
return 1;
}