Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 22, 2006, 12:34:43 AM (19 years ago)
Author:
bensch
Message:

orxonox/dylib: the first level works again, had to fix out the TestGun (it had some bugs, i think)

Location:
branches/shared_lib/src/world_entities/space_ships
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/shared_lib/src/world_entities/space_ships/helicopter.cc

    r7096 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    8279
    8380  //weapons:
    84   Weapon* wpRight = new TestGun(0);
    85   wpRight->setName("testGun Right");
    86   Weapon* wpLeft = new TestGun(1);
    87   wpLeft->setName("testGun Left");
     81//  Weapon* wpRight = new TestGun(0);
     82//  wpRight->setName("testGun Right");
     83//  Weapon* wpLeft = new TestGun(1);
     84//  wpLeft->setName("testGun Left");
    8885  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
    8986
    9087  cannon->setName("BFG");
    9188
    92   this->addWeapon(wpLeft, 1, 0);
    93   this->addWeapon(wpRight,1 ,1);
     89//  this->addWeapon(wpLeft, 1, 0);
     90//  this->addWeapon(wpRight,1 ,1);
    9491  this->addWeapon(cannon, 0, 6);
    9592

  • branches/shared_lib/src/world_entities/space_ships/hover.cc

    r7072 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    7471
    7572  //weapons:
    76   Weapon* wpRight = new TestGun(0);
    77   wpRight->setName("testGun Right");
    78   Weapon* wpLeft = new TestGun(1);
    79   wpLeft->setName("testGun Left");
    80   Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
    81 
    82   cannon->setName("BFG");
    83 
    84   this->addWeapon(wpLeft, 1, 0);
    85   this->addWeapon(wpRight,1 ,1);
    86   this->addWeapon(cannon, 0, 2);
     73//  Weapon* wpRight = new TestGun(0);
     74//  wpRight->setName("testGun Right");
     75//  Weapon* wpLeft = new TestGun(1);
     76//  wpLeft->setName("testGun Left");
     77//  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
     78
     79//  cannon->setName("BFG");
     80
     81//  this->addWeapon(wpLeft, 1, 0);
     82//  this->addWeapon(wpRight,1 ,1);
     83//  this->addWeapon(cannon, 0, 2);
    8784
    8885  this->getWeaponManager()->changeWeaponConfig(1);

  • branches/shared_lib/src/world_entities/space_ships/space_ship.cc

    r7122 r7177  
    2323#include "resource_manager.h"
    2424
    25 #include "weapons/weapon_manager.h"
    26 #include "weapons/test_gun.h"
    2725#include "weapons/turret.h"
    2826#include "weapons/cannon.h"
    … …  
    126124
    127125  //weapons:
    128   Weapon* wpRight = new TestGun(0);
    129   wpRight->setName("testGun Right");
    130   Weapon* wpLeft = new TestGun(1);
    131   wpLeft->setName("testGun Left");
     126  //Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
     127  //wpRight->setName("testGun Right");
     128  //Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate("TestGun"));
     129  //wpLeft->setName("testGun Left");
    132130  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
    133131
    134132  //cannon->setName("BFG");
    135133
    136   this->addWeapon(wpLeft, 1, 0);
    137   this->addWeapon(wpRight,1 ,1);
     134  //this->addWeapon(wpLeft, 1, 0);
     135  //this->addWeapon(wpRight,1 ,1);
    138136  //this->addWeapon(cannon, 0, 6);
    139137

  • branches/shared_lib/src/world_entities/space_ships/turbine_hover.cc

    r7126 r7177  
    2020
    2121#include "weapons/weapon_manager.h"
    22 #include "weapons/test_gun.h"
    23 #include "weapons/turret.h"
    24 #include "weapons/cannon.h"
    2522
    2623#include "factory.h"
    … …  
    7673
    7774  //weapons:
    78   Weapon* wpRight = new TestGun(0);
    79   wpRight->setName("testGun Right");
    80   Weapon* wpLeft = new TestGun(1);
    81   wpLeft->setName("testGun Left");
     75//  Weapon* wpRight = new TestGun(0);
     76//  wpRight->setName("testGun Right");
     77//  Weapon* wpLeft = new TestGun(1);
     78//  wpLeft->setName("testGun Left");
    8279  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
    8380
    8481  //  cannon->setName("BFG");
    8582
    86   this->addWeapon(wpLeft, 1, 0);
    87   this->addWeapon(wpRight,1 ,1);
     83//  this->addWeapon(wpLeft, 1, 0);
     84//  this->addWeapon(wpRight,1 ,1);
    8885  //this->addWeapon(cannon, 0, 2);
    8986
Note: See TracChangeset for help on using the changeset viewer.