From f6180db2fb6f3f763b9cb112a8e1ec5860361fbd Mon Sep 17 00:00:00 2001 From: "PolicyChanges1@gmail.com" Date: Sat, 27 Feb 2021 16:19:34 -0500 Subject: [PATCH] regressions --- dist/tetrion.js | 20 ++++++++++---------- src/main.js | 16 ++++++++-------- src/shapes.js | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dist/tetrion.js b/dist/tetrion.js index 7bcfbad..57de204 100644 --- a/dist/tetrion.js +++ b/dist/tetrion.js @@ -925,7 +925,7 @@ Tetris.prototype = { this.score = 0; this.lines = 0; // beginning of frame - this.startTime = new Date(); + this.startTime = new Date().getTime(); this.currentTime = this.startTime; this.prevTime = this.startTime; //todo:get rid of extra @@ -962,7 +962,7 @@ Tetris.prototype = { //Pause game pause: function() { this.running = false; - this.currentTime = new Date(); + this.currentTime = new Date().getTime(); this.prevTime = this.currentTime; }, pushHoldStack: function() @@ -1113,12 +1113,12 @@ Tetris.prototype = { while((inputs.gamepadQueue != undefined && inputs.gamepadQueue.length >= 1)){ var curkey = inputs.gamepadQueue.shift(); if(curkey == "DPad-Left") { - this.shape.goLeft(this.matrix, this.minoShiftSound); + this.shape.goLeft(this.matrix); this.resetLockdown(); this._draw(); } if(curkey == "DPad-Right") { - this.shape.goRight(this.matrix, this.minoShiftSound); + this.shape.goRight(this.matrix); this.resetLockdown(); this._draw(); } @@ -1173,12 +1173,12 @@ Tetris.prototype = { while((inputs.inputqueue != undefined && inputs.inputqueue.length >= 1)){ var curkey = inputs.inputqueue.shift(); if(curkey == 37) { - this.shape.goLeft(this.matrix, this.minoShiftSound); + this.shape.goLeft(this.matrix); this.resetLockdown(); this._draw(); } if(curkey == 39){ - this.shape.goRight(this.matrix, this.minoShiftSound); + this.shape.goRight(this.matrix); this.resetLockdown(); this._draw(); } @@ -1238,7 +1238,7 @@ Tetris.prototype = { if (!this.running) return; - this.currentTime = new Date(); + this.currentTime = new Date().getTime(); var deltaLevelTime = this.currentTime - this.prevTime; if (deltaLevelTime > this.interval) { // every .6 seconds? this._update(); @@ -1259,7 +1259,7 @@ Tetris.prototype = { return; if(!this.shape.isSameSRS(this.hintMino)) { - new Audio('./dist/Failed.ogg'); + new Audio('./dist/Failed.ogg').play(); this._restartHandler(); // Restart return 1; @@ -2593,14 +2593,14 @@ ShapeZR.prototype = { } }, //Move the shape to the left - goLeft: function(matrix, sound) { + goLeft: function(matrix) { if (isShapeCanMove(this, matrix, 'left')) { new Audio('./dist/Click.ogg').play(); this.x -= 1; } }, //Move the shape to the right - goRight: function(matrix, sound) { + goRight: function(matrix) { if (isShapeCanMove(this, matrix, 'right')) { new Audio('./dist/Click.ogg').play(); this.x += 1; diff --git a/src/main.js b/src/main.js index 9cacb13..ba9c85e 100644 --- a/src/main.js +++ b/src/main.js @@ -224,7 +224,7 @@ Tetris.prototype = { this.score = 0; this.lines = 0; // beginning of frame - this.startTime = new Date(); + this.startTime = new Date().getTime(); this.currentTime = this.startTime; this.prevTime = this.startTime; //todo:get rid of extra @@ -261,7 +261,7 @@ Tetris.prototype = { //Pause game pause: function() { this.running = false; - this.currentTime = new Date(); + this.currentTime = new Date().getTime(); this.prevTime = this.currentTime; }, pushHoldStack: function() @@ -412,12 +412,12 @@ Tetris.prototype = { while((inputs.gamepadQueue != undefined && inputs.gamepadQueue.length >= 1)){ var curkey = inputs.gamepadQueue.shift(); if(curkey == "DPad-Left") { - this.shape.goLeft(this.matrix, this.minoShiftSound); + this.shape.goLeft(this.matrix); this.resetLockdown(); this._draw(); } if(curkey == "DPad-Right") { - this.shape.goRight(this.matrix, this.minoShiftSound); + this.shape.goRight(this.matrix); this.resetLockdown(); this._draw(); } @@ -472,12 +472,12 @@ Tetris.prototype = { while((inputs.inputqueue != undefined && inputs.inputqueue.length >= 1)){ var curkey = inputs.inputqueue.shift(); if(curkey == 37) { - this.shape.goLeft(this.matrix, this.minoShiftSound); + this.shape.goLeft(this.matrix); this.resetLockdown(); this._draw(); } if(curkey == 39){ - this.shape.goRight(this.matrix, this.minoShiftSound); + this.shape.goRight(this.matrix); this.resetLockdown(); this._draw(); } @@ -537,7 +537,7 @@ Tetris.prototype = { if (!this.running) return; - this.currentTime = new Date(); + this.currentTime = new Date().getTime(); var deltaLevelTime = this.currentTime - this.prevTime; if (deltaLevelTime > this.interval) { // every .6 seconds? this._update(); @@ -558,7 +558,7 @@ Tetris.prototype = { return; if(!this.shape.isSameSRS(this.hintMino)) { - new Audio('./dist/Failed.ogg'); + new Audio('./dist/Failed.ogg').play(); this._restartHandler(); // Restart return 1; diff --git a/src/shapes.js b/src/shapes.js index e98c928..9085df1 100644 --- a/src/shapes.js +++ b/src/shapes.js @@ -792,14 +792,14 @@ ShapeZR.prototype = { } }, //Move the shape to the left - goLeft: function(matrix, sound) { + goLeft: function(matrix) { if (isShapeCanMove(this, matrix, 'left')) { new Audio('./dist/Click.ogg').play(); this.x -= 1; } }, //Move the shape to the right - goRight: function(matrix, sound) { + goRight: function(matrix) { if (isShapeCanMove(this, matrix, 'right')) { new Audio('./dist/Click.ogg').play(); this.x += 1;