Fix raillike bug (currently manifests itself on Android), and minor improvement to readability.

NB: Minor edits to patch made by Zeno- (int to short and minor formatting)
This commit is contained in:
Kodexky 2014-11-20 15:40:26 +10:00 committed by Craig Robbins
parent b1965ac209
commit b9bc8dadb2

@ -1621,17 +1621,18 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
video::SColor c = MapBlock_LightColor(255, l, f.light_source); video::SColor c = MapBlock_LightColor(255, l, f.light_source);
float d = (float)BS/64; float d = (float)BS/64;
float s = BS/2;
char g=-1; short g = -1;
if (is_rail_x_plus_y[0] || is_rail_x_plus_y[1] || is_rail_z_plus_y[0] || is_rail_z_plus_y[1]) if (is_rail_x_plus_y[0] || is_rail_x_plus_y[1] || is_rail_z_plus_y[0] || is_rail_z_plus_y[1])
g = 1; //Object is at a slope g = 1; //Object is at a slope
video::S3DVertex vertices[4] = video::S3DVertex vertices[4] =
{ {
video::S3DVertex(-BS/2,-BS/2+d,-BS/2, 0,0,0, c, 0,1), video::S3DVertex(-s, -s+d,-s, 0,0,0, c,0,1),
video::S3DVertex(BS/2,-BS/2+d,-BS/2, 0,0,0, c, 1,1), video::S3DVertex( s, -s+d,-s, 0,0,0, c,1,1),
video::S3DVertex(BS/2,g*BS/2+d,BS/2, 0,0,0, c, 1,0), video::S3DVertex( s, g*s+d, s, 0,0,0, c,1,0),
video::S3DVertex(-BS/2,g*BS/2+d,BS/2, 0,0,0, c, 0,0), video::S3DVertex(-s, g*s+d, s, 0,0,0, c,0,0),
}; };
for(s32 i=0; i<4; i++) for(s32 i=0; i<4; i++)