Skip to content

Commit

Permalink
Merge remote branch 'CAAT/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hyperandroid committed Jan 19, 2012
2 parents f30b641 + 91f023a commit 214114e
Showing 1 changed file with 7 additions and 7 deletions.
Expand Up @@ -37,22 +37,22 @@ CAAT.modules.splash.createSplashScene= function (director, showTime, sceneCreati
var time= new Date().getTime();

scene.addChild(
new CAAT.ImageActor().
setImage(
new CAAT.Actor().
setBackgroundImage(
director.getImage('splash'))
);

scene.addChild(
ladingActor= new CAAT.ImageActor().
setImage(ladingImg).
ladingActor= new CAAT.Actor().
setBackgroundImage(ladingImg).
setLocation(
director.width-ladingImg.width-10,
director.height-ladingImg.height-30 )
);

scene.addChild(
oActor= new CAAT.ImageActor().
setImage(oImg).
oActor= new CAAT.Actor().
setBackgroundImage(oImg).
setLocation( ladingActor.x+20, ladingActor.y+10 ).
addBehavior(
new CAAT.RotateBehavior().
Expand Down Expand Up @@ -159,7 +159,7 @@ CAAT.modules.splash.ShowDefaultSplash= function( width, height, runHere, minTime
*/
new CAAT.ImagePreloader().loadImages(
imagesURL,
splashScene.loadedImage(counter, images)
splashScene.loadedImage
);
} else {
splashScene.loadedImage(0,null);
Expand Down

0 comments on commit 214114e

Please sign in to comment.