little shrimp movement

knela96 · Apr 16, 2018 · cf03ec8 · cf03ec8
1 parent c5b37bc
commit cf03ec8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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)
 		{