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

misc whitespace changes

Browse Source
This commit is contained in:
jacob1 2019-07-23 00:11:48 -04:00
parent fb06e0028b
commit 9faf95a858
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/GameSave.cpp
View File

@ -2329,9 +2329,7 @@ char * GameSave::serialiseOPS(unsigned int & dataLength)
case PT_GLAS:
case PT_TUNG:
if (!hasPressure)
{
break;
}
pavg0 *= 64;
pavg1 *= 64;
// fallthrough!

4
src/lua/LuaScriptInterface.cpp
View File

@ -1032,9 +1032,7 @@ int LuaScriptInterface::simulation_partProperty(lua_State * l)
{
int fieldID = lua_tointeger(l, 2);
if (fieldID < 0 || fieldID >= (int)properties.size())
{
return luaL_error(l, "Invalid field ID (%d)", fieldID);
}
prop = properties.begin() + fieldID;
}
else if (lua_type(l, 2) == LUA_TSTRING)
@ -1044,10 +1042,8 @@ int LuaScriptInterface::simulation_partProperty(lua_State * l)
return p.Name == fieldName;
});
if (prop == properties.end())
{
return luaL_error(l, "Unknown field (%s)", fieldName.c_str());
}
}
else
{
return luaL_error(l, "Field ID must be an name (string) or identifier (integer)");