Changeset 6903 for code/branches/rocket/src/modules

Timestamp:

May 15, 2010, 2:57:51 PM (14 years ago)

Author:

gnadler

Message:

Cant assign Pawn* to WeakPtr<Pawn>.

Location:

code/branches/rocket/src/modules/weapons

Files:

• RocketController.cc (modified) (2 diffs)
• RocketController.h (modified) (2 diffs)

code/branches/rocket/src/modules/weapons/RocketController.cc

@@ -64 +64 @@
 
         SimpleRocket *rocket = static_cast<SimpleRocket*>(this->getControllableEntity());
-                rocket->rotatePitch(0.005);
-                rocket->setVelocity(rocket->getVelocity()*1.02);
+                if (this->target_) {
+                rocket->rotatePitch(0.5);
+                rocket->rotateYaw(0.5);
+                }
+                rocket->setVelocity(rocket->getVelocity()*1.03);
         
         }
@@ -77 +80 @@
 
 
+        void RocketController::setTarget(Pawn* target) {
+                this->target_ = target;
+        }
+
+
+
 
 }

code/branches/rocket/src/modules/weapons/RocketController.h

@@ -53 +53 @@
             virtual void tick(float dt);
                         SimpleRocket* getRocket(){return this->rocket;};
+                        void setTarget(Pawn* target);
         protected:
 
@@ -60 +61 @@
                         WeakPtr<PlayerInfo> player_;
                                                 int haha;
+                        WeakPtr<Pawn> target_;