actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed crash on no args to AddInputCallback. Clear steps for all players when deleting on ScreenEditMenu. Changed assert message in ApplyDerivedType to be useful. Fixed typos in OptionRowHandler message and EditHelpText.

Browse Source
This commit is contained in:
Kyzentun
2015-02-26 14:51:54 -07:00
parent bde705ab0b
commit c4fed9747c
10 changed files with 2469 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Screen.cpp
+4 -4
View File
@@ -374,13 +374,13 @@ bool Screen::PassInputToLua(const InputEventPlus& input)
void Screen::AddInputCallbackFromStack(lua_State* L)
{
callback_key_t key= lua_topointer(L, -1);
callback_key_t key= lua_topointer(L, 1);
m_InputCallbacks[key]= LuaReference(L);
}
void Screen::RemoveInputCallback(lua_State* L)
{
callback_key_t key= lua_topointer(L, -1);
callback_key_t key= lua_topointer(L, 1);
if(m_CallingInputCallbacks)
{
m_DelayedCallbackRemovals.push_back(key);
@@ -424,7 +424,7 @@ public:
static int AddInputCallback(T* p, lua_State* L)
{
if(!lua_isfunction(L, -1))
if(!lua_isfunction(L, 1))
{
luaL_error(L, "Input callback must be a function.");
}
@@ -434,7 +434,7 @@ public:
static int RemoveInputCallback(T* p, lua_State* L)
{
if(!lua_isfunction(L, -1))
if(!lua_isfunction(L, 1))
{
luaL_error(L, "Input callback must be a function.");
}