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

Fix -Werror=misleading-indentation (#369)

Browse Source
This commit is contained in:
Issue tracking bot 2017-02-20 18:51:10 -05:00 committed by jacob1
parent ac8c01ae57
commit d9115fc3fe
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lua/LuaScriptInterface.cpp
View File

@ -1574,10 +1574,14 @@ int LuaScriptInterface::simulation_decoColor(lua_State * l)
b = luaL_optint(l, 3, 255);
a = luaL_optint(l, 4, 255);
if (r < 0) r = 0; if (r > 255) r = 255;
if (g < 0) g = 0; if (g > 255) g = 255;
if (b < 0) b = 0; if (b > 255) b = 255;
if (a < 0) a = 0; if (a > 255) a = 255;
if (r < 0) r = 0;
if (r > 255) r = 255;
if (g < 0) g = 0;
if (g > 255) g = 255;
if (b < 0) b = 0;
if (b > 255) b = 255;
if (a < 0) a = 0;
if (a > 255) a = 255;
color = (a << 24) + PIXRGB(r, g, b);
}

4
src/simulation/elements/PIPE.cpp
View File

@ -167,8 +167,8 @@ int Element_PIPE::update(UPDATE_FUNC_ARGS)
}
count++;
}
if(neighborcount == 1)
parts[lastneighbor].tmp |= 0x100;
if (neighborcount == 1)
parts[lastneighbor].tmp |= 0x100;
}
else
{