Fix wallmounted rotations along Y axis for 90 and 270 degree cases

kwolekr · kwolekr · commit fca4610f1174 · 2013-07-08T18:50:29.000-04:00
diff --git a/src/mapnode.cpp b/src/mapnode.cpp
@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 static const Rotation wallmounted_to_rot[] = {
 	ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270
 };
+
 static const u8 rot_to_wallmounted[] = {
 	2, 4, 3, 5
 };
@@ -154,7 +155,7 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {
 			
 		Rotation oldrot = wallmounted_to_rot[wmountface - 2];
 		param2 &= ~7;
-		param2 |= rot_to_wallmounted[(oldrot + rot) & 3];
+		param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`31`	`31`	`static const Rotation wallmounted_to_rot[] = {`
`32`	`32`	`ROTATE_0, ROTATE_180, ROTATE_90, ROTATE_270`
`33`	`33`	`};`
	`34`	`+`
`34`	`35`	`static const u8 rot_to_wallmounted[] = {`
`35`	`36`	`2, 4, 3, 5`
`36`	`37`	`};`
`@@ -154,7 +155,7 @@ void MapNode::rotateAlongYAxis(INodeDefManager *nodemgr, Rotation rot) {`
`154`	`155`
`155`	`156`	`Rotation oldrot = wallmounted_to_rot[wmountface - 2];`
`156`	`157`	`param2 &= ~7;`
`157`		`- param2 \|= rot_to_wallmounted[(oldrot + rot) & 3];`
	`158`	`+ param2 \|= rot_to_wallmounted[(oldrot - rot) & 3];`
`158`	`159`	`}`
`159`	`160`	`}`
`160`	`161`