Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10235 in orxonox.OLD


Ignore:
Timestamp:
Jan 14, 2007, 4:34:23 PM (14 years ago)
Author:
nicolasc
Message:

inital upload of projectile_weapon, started usage in spike_ball

Location:
branches/playability/src/world_entities
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/playability/src/world_entities/WorldEntities.am

    r10180 r10235  
    5858                world_entities/projectiles/hyperblast.cc \
    5959                world_entities/projectiles/spike.cc \
     60                world_entities/projectiles/acid_splash.cc \
     61                \
     62                world_entities/projectiles/projectile_weapon.cc \
    6063                world_entities/projectiles/spike_ball.cc \
    61                 world_entities/projectiles/acid_splash.cc \
    6264                \
    6365                world_entities/power_ups/turret_power_up.cc \
     
    180182                projectiles/acid_splash.h \
    181183                \
     184                projectiles/projectile_weapon.h \
     185                projectiles/spike_ball.h \
     186                \
    182187                power_ups/turret_power_up.h \
    183188                power_ups/laser_power_up.h \
  • branches/playability/src/world_entities/projectiles/spike_ball.cc

    r10229 r10235  
    3131#include "space_ships/space_ship.h"
    3232
    33 #include "weapons/weapon.h"
    34 #include "../weapons/weapon_manager.h"
     33// #include "weapons/weapon.h"
     34// #include "../weapons/weapon_manager.h"
    3535
    3636#include "class_id_DEPRECATED.h"
     
    4141 *  standard constructor
    4242*/
    43 SpikeBall::SpikeBall () : Projectile()
     43SpikeBall::SpikeBall () : ProjectileWeapon()
    4444{
    4545  this->registerObject(this, SpikeBall::_objectList);
     
    6565  this->halo->setSize(2, 2);
    6666  this->halo->setTexture("hbolt_halo.png");
    67 
     67/*
    6868  this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
    6969  this->weaponMan->setParentEntity(this);
     
    7777  this->weaponMan->changeWeaponConfig(0);
    7878
    79   this->weaponMan->getWeapon(0)->increaseEnergy(50);
     79  this->weaponMan->getWeapon(0)->increaseEnergy(50);*/
    8080}
    8181
     
    195195void SpikeBall::destroy (WorldEntity* killer)
    196196{
    197   Projectile::destroy( killer );
     197  ProjectileWeapon::destroy( killer );
    198198  PRINTF(5)("DESTROY SpikeBall\n");
    199199  this->lifeCycle = .95; //!< @todo calculate this usefully.
  • branches/playability/src/world_entities/projectiles/spike_ball.h

    r10224 r10235  
    77#define _SPIKE_BALL_H
    88
    9 #include "projectile.h"
     9#include "projectile_weapon.h"
    1010#include "effects/billboard.h"
    1111
    12 #include "../weapons/spike_launcher.h"
     12// #include "../weapons/spike_launcher.h"
    1313
    1414
     
    1616
    1717class Vector;
    18 class Weapon;
     18class ProjectileWeapon;
    1919class SpriteParticles;
    2020class ParticleEmitter;
    2121class FastFactory;
    22 class WeaponManager;
     22class FastFactory;
    2323
    2424
    25 class SpikeBall : public Projectile
     25class SpikeBall : public ProjectileWeapon
    2626{
    2727  ObjectListDeclaration(SpikeBall);
  • branches/playability/src/world_entities/space_ships/space_ship.cc

    r10233 r10235  
    176176  cannon->setName( "SwarmLauncher");
    177177
    178   Weapon* spike = new SpikeThrower();
    179   spike->setName( "SpikeThrower" );
     178//   Weapon* spike = new SpikeThrower();
     179//   spike->setName( "SpikeThrower" );
    180180
    181181  Weapon* spike2 = new SpikeLauncher();
    182   spike->setName( "SpikeLauncher" );
     182  spike2->setName( "SpikeLauncher" );
    183183
    184184  this->weaponMan.addWeapon( wpLeft1, 0, 0);
     
    201201
    202202  this->secWeaponMan.addWeapon( cannon, 0, 0);
    203   this->secWeaponMan.addWeapon( spike, 1, 1);
     203/*  this->secWeaponMan.addWeapon( spike, 1, 1);*/
    204204  this->secWeaponMan.addWeapon( spike2, 2, 2);
    205205
    206206 
    207207  this->weaponMan.changeWeaponConfig(3);
    208   this->secWeaponMan.changeWeaponConfig(1);
     208  this->secWeaponMan.changeWeaponConfig(2);
    209209
    210210  curWeaponPrimary    = 3;
Note: See TracChangeset for help on using the changeset viewer.