wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-08-14 12:40:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed issue in FrameData.getFrameIndexes where the input array was being ignored.

Browse Source
This commit is contained in:
Richard Davey
2013-09-18 14:02:31 +01:00
parent 91c07ea37d
commit 47834ad478
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Phaser.js
+1 -1
View File
@@ -3,7 +3,7 @@
*/
var Phaser = Phaser || {
VERSION: '1.0.4',
VERSION: '1.0.5',
GAMES: [],
AUTO: 0,
CANVAS: 1,
src/animation/FrameData.js
+6 -6
View File
@@ -188,14 +188,14 @@ Phaser.Animation.FrameData.prototype = {
* @param {Array} [output] Optional array. If given the results will be appended to the end of this Array, otherwise a new array is created.
* @return {Array} An array of all Frame indexes matching the given names or IDs.
*/
getFrameIndexes: function (input, useNumericIndex, output) {
getFrameIndexes: function (frames, useNumericIndex, output) {
if (typeof useNumericIndex === "undefined") { useNumericIndex = true; }
if (typeof output === "undefined") { output = []; }
if (typeof frames === "undefined" || frames.length == 0)
{
// No input array, so we loop through all frames
// No frames array, so we loop through all frames
for (var i = 0, len = this._frames.length; i < len; i++)
{
output.push(this._frames[i].index);
@@ -204,16 +204,16 @@ Phaser.Animation.FrameData.prototype = {
else
{
// Input array given, loop through that instead
for (var i = 0, len = input.length; i < len; i++)
for (var i = 0, len = frames.length; i < len; i++)
{
// Does the input array contain names or indexes?
// Does the frames array contain names or indexes?
if (useNumericIndex)
{
output.push(input[i].index);
output.push(frames[i].index);
}
else
{
output.push(this.getFrameByName(input[i]).index);
output.push(this.getFrameByName(frames[i]).index);
}
}
}