Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gameover now RESTARTS if you hit pipe #39

Merged
merged 2 commits into from
Mar 23, 2018
Merged

gameover now RESTARTS if you hit pipe #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96cda64
gameover now RESTARTS if you hit pipe
DaGuT Mar 13, 2018
265a618
Merge branch 'master' into gameoverfix
Versatilus Mar 23, 2018
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
10 changes: 4 additions & 6 deletions sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var pipeBodySprite;
var pipePeakSprite;
var bgImg;
var bgX;
var gameisover = false;
var gameoverFrame=0;

var touched = false;
var prevTouched = touched;
Expand Down Expand Up @@ -75,7 +75,7 @@ function draw() {
bird.update();
bird.show();

if (frameCount % 150 === 0) {
if ((frameCount-gameoverFrame) % 150 == 0) {
pipes.push(new Pipe());
}

Expand All @@ -97,9 +97,6 @@ function draw() {
prevTouched = touched;


if (gameisover) {
noLoop();
}
}

function showScores() {
Expand All @@ -113,14 +110,15 @@ function gameover() {
text('HIT', width / 2, height / 2);
maxScore = max(score, maxScore);
score = 0;
gameisover = true;
reset();
}

function reset() {
bgX = 0;
pipes = [];
bird = new Bird();
pipes.push(new Pipe());
gameoverFrame=frameCount-1;
}

function keyPressed() {
Expand Down