andrew/moonlight-skulk
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #34 : undefined reference was due to abuse of game.rnd.integerInRange out of bounds

Browse Source
This commit is contained in:
Andrew Kesterson
2014-07-06 15:48:27 -07:00
parent 63ed93a653
commit 3e27b50a80
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
moonlight/src/GameStates.js
View File

@@ -332,6 +332,8 @@ GameState.prototype.update = function()
if ( hasState(player, STATE_STEALING) == true && if ( hasState(player, STATE_STEALING) == true &&
x.sprite_has_treasure == true ) { x.sprite_has_treasure == true ) {
var prevpos = player.body.position; var prevpos = player.body.position;
var prevwidth = player.body.width;
var prevheight = player.body.height;
player.body.position = new Phaser.Point(); player.body.position = new Phaser.Point();
player.body.x = prevpos.x; player.body.x = prevpos.x;
player.body.y = prevpos.y; player.body.y = prevpos.y;
@@ -390,6 +392,8 @@ GameState.prototype.update = function()
rs.fixedToCamera = true; rs.fixedToCamera = true;
} }
player.body.position = prevpos; player.body.position = prevpos;
player.body.width = prevwidth;
player.body.height = prevheight;
} }
} }

4
moonlight/src/Util.js
View File

@@ -60,9 +60,7 @@ function nearestInGroup(sprite, group, sprite_group) {
var nearest = null; var nearest = null;
var lastdist = 0.0; var lastdist = 0.0;
for ( var i = 0 ; i < group.length; i++ ) { for ( var i = 0 ; i < group.length; i++ ) {
console.log("Checking distance to group[" + i + "]");
var spr = group.getChildAt(i); var spr = group.getChildAt(i);
console.log(spr);
if ( (typeof sprite_group !== undefined) && if ( (typeof sprite_group !== undefined) &&
spr.sprite_group !== sprite_group ) spr.sprite_group !== sprite_group )
continue; continue;
@@ -342,6 +340,6 @@ function awardPlayerScoreByState(state)
function getRandomTreasure() function getRandomTreasure()
{ {
var treasures = Object.keys(moonlightTreasures); var treasures = Object.keys(moonlightTreasures);
var treasure = treasures[game.rnd.integerInRange(0, treasures.length)]; var treasure = treasures[game.rnd.integerInRange(0, treasures.length-1)];
return treasure; return treasure;
} }