matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when using elem.element on windows

Browse Source
This commit is contained in:
jacob1 2018-09-17 23:03:05 -04:00
parent 7f215a6a17
commit 276098f9db
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lua/LuaScriptInterface.cpp
View File

@ -2399,11 +2399,17 @@ void LuaScriptInterface::LuaGetProperty(lua_State* l, StructProperty property, i
lua_pushinteger(l, *((unsigned char*)propertyAddress)); lua_pushinteger(l, *((unsigned char*)propertyAddress));
break; break;
case StructProperty::BString: case StructProperty::BString:
lua_pushstring(l, *((char**)propertyAddress)); {
ByteString byteStringProperty = *((ByteString*)propertyAddress);
lua_pushstring(l, byteStringProperty.c_str());
break; break;
}
case StructProperty::String: case StructProperty::String:
lua_pushstring(l, (*((String*)propertyAddress)).ToUtf8().c_str()); {
ByteString byteStringProperty = (*((String*)propertyAddress)).ToUtf8();
lua_pushstring(l, byteStringProperty.c_str());
break; break;
}
case StructProperty::Colour: case StructProperty::Colour:
#if PIXELSIZE == 4 #if PIXELSIZE == 4
lua_pushinteger(l, *((unsigned int*)propertyAddress)); lua_pushinteger(l, *((unsigned int*)propertyAddress));