conflict resolution

src/Game.cpp

@@ -577,6 +577,9 @@ namespace ZL
 			explosionEmitter.draw(renderer, Environment::zoom, Environment::width, Environment::height);
 		}
 
+		//glBindTexture(GL_TEXTURE_2D, basePlatformTexture->getTexID());
+		//renderer.DrawVertexRenderStruct(basePlatform);
+
 		glDisable(GL_BLEND);
 		renderer.PopMatrix();
 		renderer.PopProjectionMatrix();
@@ -1297,7 +1300,7 @@ namespace ZL
 				handleMotion(mx, my);
 
 			}
-			/*
+			
 			if (event.type == SDL_MOUSEWHEEL) {
 				static const float zoomstep = 2.0f;
 				if (event.wheel.y > 0) {
@@ -1314,9 +1317,17 @@ namespace ZL
 			{
 				if (event.key.keysym.sym == SDLK_i)
 				{
-
+					x = x + 1;
 				}
-			}*/
+				if (event.key.keysym.sym == SDLK_k)
+				{
+					x = x - 1;
+				}
+				if (event.key.keysym.sym == SDLK_a)
+				{
+					Environment::shipState.position = { 9466.15820, 1046.00159, 18531.2090 };
+				}
+			}
 #endif
 		}
 		render();