mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-01 17:38:41 +00:00
Switch player names to std::string
This commit is contained in:
parent
603eb57943
commit
cc8e7a569e
18 changed files with 39 additions and 36 deletions
|
@ -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));
|
||||
}
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue