checked collision conditions and moved walls

Author: knela96

Game/XMultiply.exe

@@ -174,46 +174,8 @@ Collider* ModuleCollision::AddCollider(SDL_Rect rect, COLLIDER_TYPE type, Module
 
 bool Collider::CheckCollision(const SDL_Rect& r) const
 {
-	// TODO 0: Return true if there is an overlap
-	// between argument "r" and property "rect"
-
-	//The sides of the rectangles
-	int leftA, leftB;
-	int rightA, rightB;
-	int topA, topB;
-	int bottomA, bottomB;
-
-	//Calculate the sides of rect A
-	leftA = r.x;
-	rightA = r.x + r.w;
-	topA = r.y;
-	bottomA = r.y + r.h;
-
-	//Calculate the sides of rect B
-	leftB = rect.x;
-	rightB = rect.x + rect.w;
-	topB = rect.y;
-	bottomB = rect.y + rect.h;
-
-	//If any of the sides from A are outside of B
-	if (bottomA <= topB)
-	{
-		return false;
-	}
-
-	if (topA >= bottomB)
-	{
+	if (r.y + r.h <= rect.y || r.y >= rect.y + rect.h || r.x + r.w <= rect.x || r.x >= rect.x + rect.w)
 		return false;
-	}
-
-	if (rightA <= leftB)
-	{
-		return false;
-	}
-
-	if (leftA >= rightB)
-	{
-		return false;
-	}
-	return true;
+	else
+		return true;
 }

Game/XMultiply.zip

@@ -27,7 +27,6 @@ bool ModuleParticles::Start()
 	graphics = App->textures->Load("Assets/Player.png"); // arcade version
 
 	shoot.anim.PushBack({ 64, 30, 17, 18});
-	//shoot.fx = SHOOT_FX;
 	shoot.anim.loop = false;
 	shoot.anim.speed = 3.0f;
 	shoot.life = 2000;
@@ -93,13 +92,6 @@ update_status ModuleParticles::Update()
 				p->fx_played = true;
 				p->speed.x = 2;
 				App->audio->PlaySound(p->common_fx);
-				/*
-				switch (p->fx){
-				case EXPLOSION_FX:
-					App->audio->PlaySound(p->common_fx);
-				case SHOOT_FX:
-					App->audio->PlaySound(shoot.common_fx);
-				}*/
 			}
 		}
 	}

ModuleCollision.cpp

@@ -47,7 +47,7 @@ bool ModuleSceneStage1::Start()
 	back = App->textures->Load("Assets/FirstLvlMap3.png");
 
 	// Colliders ---
-	App->collision->AddCollider({ 0, 224, 3930, 16 }, COLLIDER_WALL);
+	App->collision->AddCollider({ 0, 208, 3930, 16 }, COLLIDER_WALL);
 	App->collision->AddCollider({ 1380, 0, 100, 100 }, COLLIDER_WALL);
 	App->collision->AddCollider({ 1380, 140, 100, 120 }, COLLIDER_WALL);