Merge branch 'master' of https://github.com/knela96/Project1

knela96 · Jun 5, 2018 · 206664a · 206664a
2 parents 7cae323 + 34d3cdf
commit 206664a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Globals.h b/Globals.h
@@ -54,7 +54,7 @@ typedef unsigned int uint;
 #define SCREEN_WIDTH 384 //384
 #define SCREEN_HEIGHT 256 //256
 #define WIN_FULLSCREEN 0
-#define WIN_FULLSCREEN_DESKTOP 0
+#define WIN_FULLSCREEN_DESKTOP 1
 #define WIN_BORDERLESS 0
 #define WIN_RESIZABLE 1
 #define REN_VSYNC 1

diff --git a/ModuleParticles.cpp b/ModuleParticles.cpp
@@ -436,7 +436,7 @@ void ModuleParticles::orderlist() {
 void ModuleParticles::MissilleMovement(Particle *p) {
 
 	if (p->target != nullptr) {
- 		if (p->target->position.x < 0) {
+ 		if (p->target != nullptr) {
   			p->target = nullptr;
 			p->speed.x = 4;
 			p->speed.y = 0;
@@ -470,7 +470,6 @@ void ModuleParticles::MissilleMovement(Particle *p) {
 		p->speed.y = 0;
 		p->angle = 0.0f;
 	}
-
 }
 
 

diff --git a/ModulePlayer.cpp b/ModulePlayer.cpp
@@ -213,7 +213,6 @@ update_status ModulePlayer::Update()
 				App->tentacles->ShootLaser();
 				App->audio->PlaySound(App->particles->basic_shoot.fx);
 			}
-			powerup[MISSILE_SHOOT] = true;
 			if (powerup[MISSILE_SHOOT] == true) {
 				if (App->particles->active_missiles == 0) {
 					App->particles->active_missiles = 4;