Changeset 10721 in orxonox.OLD for branches/presentation/src/world_entities/weapons

Timestamp:

Jun 18, 2007, 7:40:40 PM (18 years ago)

Author:

nicolasc

Message:

bump, minor fixes

Location:

branches/presentation/src/world_entities/weapons

Files:

• crosshair.cc (modified) (1 diff)
• nadion_laser.cc (modified) (1 diff)
• weapon_manager.h (modified) (1 diff)

branches/presentation/src/world_entities/weapons/crosshair.cc

@@ -64 +64 @@
   this->material = new Material;
 
-  //this->subscribeEvent(ES_GAME, EV_MOUSE_MOTION);
+//   this->subscribeEvent(ES_GAME, EV_MOUSE_MOTION);
 
   // center the mouse on the screen, and also hide the cursors
-  /*  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
-  GraphicsEngine::showMouse(false);
-  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);*/
+/*  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);*/
+//   GraphicsEngine::showMouse(false);
+//   SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
 }
 

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -147 +147 @@
 
   pj->setAbsCoor(this->getEmissionPoint());
-//   pj->setAbsDir(this->getAbsDir());
+//   pj->setAbsDir(Quaternion(this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor(), Vector(0,0,0)));
+  pj->setAbsDir(this->getAbsDir());
   pj->activate();
 

branches/presentation/src/world_entities/weapons/weapon_manager.h

@@ -91 +91 @@
     Weapon* getWeapon(int slotID) const;
 
-    // FIXME ::
 //    bool hasFreeSlot(int configID, long capability = WTYPE_ALL) { return ( getNextFreeSlot(configID, capability ) != -1)? true : false; };