Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plataformas/Debug/plataformas.exe.recipe
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<ProjectOutputs>
<ProjectOutput>
<FullPath>C:\Users\uo276406\Desktop\plataformas\Debug\plataformas.exe</FullPath>
<FullPath>C:\Users\diego\OneDrive\Escritorio\SEV\plataformas\Debug\plataformas.exe</FullPath>
</ProjectOutput>
</ProjectOutputs>
<ContentFiles />
Expand Down
Binary file modified plataformas/Debug/plataformas.ilk
Binary file not shown.
127 changes: 28 additions & 99 deletions plataformas/Debug/plataformas.log

Large diffs are not rendered by default.

Binary file modified plataformas/Debug/plataformas.tlog/CL.command.1.tlog
Binary file not shown.
Binary file modified plataformas/Debug/plataformas.tlog/CL.read.1.tlog
Binary file not shown.
Binary file modified plataformas/Debug/plataformas.tlog/CL.write.1.tlog
Binary file not shown.
Binary file modified plataformas/Debug/plataformas.tlog/link.command.1.tlog
Binary file not shown.
Binary file modified plataformas/Debug/plataformas.tlog/link.read.1.tlog
Binary file not shown.
Binary file modified plataformas/Debug/plataformas.tlog/link.write.1.tlog
Binary file not shown.
4 changes: 2 additions & 2 deletions plataformas/Debug/plataformas.tlog/plataformas.lastbuildstate
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30037:TargetPlatformVersion=10.0.19041.0:
Debug|Win32|C:\Users\uo276406\Desktop\plataformas\|
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.18362.0:
Debug|Win32|C:\Users\diego\OneDrive\Escritorio\SEV\plataformas\|
Binary file modified plataformas/Debug/vc142.idb
Binary file not shown.
Binary file modified plataformas/Debug/vc142.pdb
Binary file not shown.
24 changes: 19 additions & 5 deletions plataformas/GameLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,31 @@ void GameLayer::update() {
}


// Colisiones
for (auto const& enemy : enemies) {
if (player->isOverlap(enemy)) {
player->loseLife();

if (player->vy > 0 && player->y < enemy->y
&& player->isOverlap(enemy)
&& player->lifes > 0 && enemy->state != game->stateDead) {

enemy->impacted();
player->lifes++;
player->invulnerableTime = 0;
points++;
textPoints->content = to_string(points);
player->onAir = false;
player->jump();
}

if (player->isOverlap(enemy) && enemy->state != game->stateDead) {
player->loseLife();

if (player->lifes <= 0) {
init();
return;
}
}
}

// Colisiones , Enemy - Projectile

list<Enemy*> deleteEnemies;
list<Projectile*> deleteProjectiles;
Expand All @@ -273,7 +286,8 @@ void GameLayer::update() {
}
}


// Colisiones , Enemy - Projectile
// Player(saltando) - enemy

for (auto const& enemy : enemies) {
for (auto const& projectile : projectiles) {
Expand Down