From cf03ec816d28e9936b028c307adeae6aa5d9182d Mon Sep 17 00:00:00 2001
From: Rafefix <36264913+Rafefix@users.noreply.github.com>
Date: Tue, 17 Apr 2018 01:41:35 +0200
Subject: [PATCH] little shrimp movement

---
 Globals.h             | 4 ----
 ModuleSceneStage1.cpp | 6 +++---
 ModuleWindow.cpp      | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Globals.h b/Globals.h
index 2cd4f6c..6bb5bad 100644
--- a/Globals.h
+++ b/Globals.h
@@ -24,10 +24,6 @@ enum ENEMY_TYPES
 	BROWN_WORM,
 	LITTLE_SHRIMP,
 	NEMONA_TENTACLE,
-<<<<<<< HEAD
-
-=======
->>>>>>> 6fa0dde5a98f294badc779735438f764efdcb672
 };
 
 enum ENEMY_PARTICLES
diff --git a/ModuleSceneStage1.cpp b/ModuleSceneStage1.cpp
index 37ad7dd..6028e66 100644
--- a/ModuleSceneStage1.cpp
+++ b/ModuleSceneStage1.cpp
@@ -61,10 +61,10 @@ bool ModuleSceneStage1::Start()
 	App->enemies->AddEnemy(BROWN_WORM, 300, 100);
 	App->enemies->AddEnemy(BROWN_WORM, 300, 150);
 	App->enemies->AddEnemy(BROWN_WORM, 300, 200);
-	App->enemies->AddEnemy(LITTLE_SHRIMP, 400, 50);
-	App->enemies->AddEnemy(LITTLE_SHRIMP, 400, 100);
-	App->enemies->AddEnemy(LITTLE_SHRIMP, 400, 150);
 	App->enemies->AddEnemy(LITTLE_SHRIMP, 400, 200);
+	App->enemies->AddEnemy(LITTLE_SHRIMP, 415, 200);
+	App->enemies->AddEnemy(LITTLE_SHRIMP, 440, 200);
+	App->enemies->AddEnemy(LITTLE_SHRIMP, 465, 200);
 	App->enemies->AddEnemy(NEMONA_TENTACLE, 520, 148);
 
 	//POWERUPS
diff --git a/ModuleWindow.cpp b/ModuleWindow.cpp
index b7fa909..d0e49f2 100644
--- a/ModuleWindow.cpp
+++ b/ModuleWindow.cpp
@@ -43,7 +43,7 @@ bool ModuleWindow::Init()
 		if(WIN_FULLSCREEN_DESKTOP == true)
 			flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
-		window = SDL_CreateWindow("XMultiply - v0.3", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+		window = SDL_CreateWindow("XMultiply - v0.4", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
 
 		if(window == NULL)
 		{