wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-07-16 01:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Group to fix some issues with not checking children

Browse Source
This commit is contained in:
Richard Davey
2013-09-15 00:14:45 +01:00
parent 1bf838a4c4
commit 49a6ba2c02
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+6
View File
@@ -113,6 +113,12 @@ Although Phaser 1.0 is a brand new release it is born from years of experience b
![Phaser Particles](http://www.photonstorm.com/wp-content/uploads/2013/04/phaser_particles.png)
Change Log
----------
* Added checks into every Group function to ensure that the Group has children before running them.
* Added optional flag to Group.create which allows you to set the default exists state of the Sprites.
Known Issues
------------
src/core/Group.js
+24 -11
View File
@@ -91,11 +91,14 @@ Phaser.Group.prototype = {
},
create: function (x, y, key, frame) {
create: function (x, y, key, frame, exists) {
if (typeof exists == 'undefined') { exists = true; }
var child = new Phaser.Sprite(this.game, x, y, key, frame);
child.group = this;
child.exists = exists;
if (child.events)
{
@@ -379,7 +382,7 @@ Phaser.Group.prototype = {
checkVisible = checkVisible || false;
operation = operation || 0;
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -430,7 +433,7 @@ Phaser.Group.prototype = {
var args = Array.prototype.splice.call(arguments, 2);
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -453,7 +456,7 @@ Phaser.Group.prototype = {
if (typeof checkExists == 'undefined') { checkExists = false; }
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -474,7 +477,7 @@ Phaser.Group.prototype = {
forEachAlive: function (callback, callbackContext) {
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -495,7 +498,7 @@ Phaser.Group.prototype = {
forEachDead: function (callback, callbackContext) {
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -525,7 +528,7 @@ Phaser.Group.prototype = {
state = true;
}
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -553,7 +556,7 @@ Phaser.Group.prototype = {
*/
getFirstAlive: function () {
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -581,7 +584,7 @@ Phaser.Group.prototype = {
*/
getFirstDead: function () {
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -610,7 +613,7 @@ Phaser.Group.prototype = {
var total = -1;
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -639,7 +642,7 @@ Phaser.Group.prototype = {
var total = -1;
if (this._container.first._iNext)
if (this._container.children.length > 0 && this._container.first._iNext)
{
var currentNode = this._container.first._iNext;
@@ -669,6 +672,11 @@ Phaser.Group.prototype = {
*/
getRandom: function (startIndex, length) {
if (this._container.children.length == 0)
{
return null;
}
startIndex = startIndex || 0;
length = length || this._container.children.length;
@@ -705,6 +713,11 @@ Phaser.Group.prototype = {
removeBetween: function (startIndex, endIndex) {
if (this._container.children.length == 0)
{
return;
}
if (startIndex > endIndex || startIndex < 0 || endIndex > this._container.children.length)
{
return false;