Merge pull request #1449 from OutpostUniverse/Feature/MapOffset_Operator_Overloads

Feature/map offset operator overloads

Author: DanRStevens

OPHD/Map/MapOffset.h

@@ -8,3 +8,35 @@ struct MapOffset
 	NAS2D::Vector<int> xy;
 	int z;
 };
+
+
+inline bool operator==(const MapOffset& offset1, const MapOffset& offset2)
+{
+	return offset1.xy == offset2.xy && offset1.z == offset2.z;
+}
+
+
+inline bool operator!=(const MapOffset& offset1, const MapOffset& offset2)
+{
+	return !(offset1 == offset2);
+}
+
+
+inline MapOffset& operator*=(MapOffset& offset, int scalar)
+{
+	offset.xy *= scalar;
+	offset.z *= scalar;
+	return offset;
+}
+
+
+inline MapOffset operator*(MapOffset offset, int scalar)
+{
+	return offset *= scalar;
+}
+
+
+inline MapOffset operator*(int scalar, MapOffset offset)
+{
+	return offset *= scalar;
+}

OPHD/States/MapViewState.cpp

@@ -421,22 +421,22 @@ void MapViewState::onKeyDown(NAS2D::EventHandler::KeyCode key, NAS2D::EventHandl
 
 		case NAS2D::EventHandler::KeyCode::KEY_w:
 		case NAS2D::EventHandler::KeyCode::KEY_UP:
-			mMapView->moveView(MapOffset{DirectionNorthWest * shiftMoveScalar, 0});
+			moveView(MapOffsetNorthWest * shiftMoveScalar);
 			break;
 
 		case NAS2D::EventHandler::KeyCode::KEY_s:
 		case NAS2D::EventHandler::KeyCode::KEY_DOWN:
-			mMapView->moveView(MapOffset{DirectionSouthEast * shiftMoveScalar, 0});
+			moveView(MapOffsetSouthEast * shiftMoveScalar);
 			break;
 
 		case NAS2D::EventHandler::KeyCode::KEY_a:
 		case NAS2D::EventHandler::KeyCode::KEY_LEFT:
-			mMapView->moveView(MapOffset{DirectionSouthWest * shiftMoveScalar, 0});
+			moveView(MapOffsetSouthWest * shiftMoveScalar);
 			break;
 
 		case NAS2D::EventHandler::KeyCode::KEY_d:
 		case NAS2D::EventHandler::KeyCode::KEY_RIGHT:
-			mMapView->moveView(MapOffset{DirectionNorthEast * shiftMoveScalar, 0});
+			moveView(MapOffsetNorthEast * shiftMoveScalar);
 			break;
 
 		case NAS2D::EventHandler::KeyCode::KEY_0:
@@ -741,7 +741,6 @@ void MapViewState::onChangeDepth(int oldDepth, int newDepth) {
 
 void MapViewState::moveView(MapOffset offset) {
 	int oldZLevel = mMapView->currentDepth();
-	
 	mMapView->moveView(offset);
 
 	int newZLevel = mMapView->currentDepth();