Browse Source

tutorial tweaks that are not necessary but will make the tutorial a bit easier:
removed unnecessary calls in ShooterControls::onRemoveBehavior
fixed a bad reference to caustics particle effect

Charlie Patterson 12 years ago
parent
commit
ba0ec5d9ff

+ 1 - 1
modules/TropicalAssets/1/assets/particles/caustics.asset.taml

@@ -6,7 +6,7 @@
 		EmitterSize="100 1"
 		EmitterSize="100 1"
 		FixedAspect="false"
 		FixedAspect="false"
         OldestInFront="1"
         OldestInFront="1"
-        Image="@asset=AquariumToy:Beam">
+        Image="@asset=ToyAssets:Beam">
         <ParticleAssetEmitter.Fields>
         <ParticleAssetEmitter.Fields>
             <Quantity
             <Quantity
                 Keys="0 1" />
                 Keys="0 1" />

+ 0 - 7
tutorials/fishTutorialBase/modules/DeadlyReef/scripts/behaviors/movement/shooterControls.cs

@@ -58,17 +58,10 @@ function ShooterControlsBehavior::onBehaviorRemove(%this)
     if (!isObject(GlobalActionMap))
     if (!isObject(GlobalActionMap))
        return;
        return;
 
 
-    %this.owner.disableUpdateCallback();
-
     GlobalActionMap.unbindObj(getWord(%this.upKey, 0), getWord(%this.upKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.upKey, 0), getWord(%this.upKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.downKey, 0), getWord(%this.downKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.downKey, 0), getWord(%this.downKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.leftKey, 0), getWord(%this.leftKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.leftKey, 0), getWord(%this.leftKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.rightKey, 0), getWord(%this.rightKey, 1), %this);
     GlobalActionMap.unbindObj(getWord(%this.rightKey, 0), getWord(%this.rightKey, 1), %this);
-
-    %this.up = 0;
-    %this.down = 0;
-    %this.left = 0;
-    %this.right = 0;
 }
 }
 
 
 function ShooterControlsBehavior::updateMovement(%this)
 function ShooterControlsBehavior::updateMovement(%this)