[Orxonox-commit 274] r2921 - in branches/weapons/src/orxonox/objects/weaponSystem: . weaponmodes
landauf at orxonox.net
landauf at orxonox.net
Sat Apr 18 19:06:36 CEST 2009
Author: landauf
Date: 2009-04-18 19:06:36 +0200 (Sat, 18 Apr 2009)
New Revision: 2921
Added:
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h
Removed:
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.cc
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.h
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.cc
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.h
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.cc
branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.h
branches/weapons/src/orxonox/objects/weaponSystem/weapons/
Modified:
branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt
Log:
renamed directory "weapons" as "weaponmodes"
Modified: branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt 2009-04-18 16:59:02 UTC (rev 2920)
+++ branches/weapons/src/orxonox/objects/weaponSystem/CMakeLists.txt 2009-04-18 17:06:36 UTC (rev 2921)
@@ -11,4 +11,4 @@
ADD_SUBDIRECTORY(munitions)
ADD_SUBDIRECTORY(projectiles)
-ADD_SUBDIRECTORY(weapons)
+ADD_SUBDIRECTORY(weaponmodes)
Property changes on: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/buildsystem/src/orxonox/objects/weaponSystem/weapons:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons:2507-2659
/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons:2663-2709
/branches/ceguilua/src/orxonox/objects/weaponSystem/weapons:1803-1809
/branches/core3/src/orxonox/objects/weaponSystem/weapons:1573-1740
/branches/gcc43/src/orxonox/objects/weaponSystem/weapons:1581
/branches/gui/src/orxonox/objects/weaponSystem/weapons:1636-1724,2796-2895
/branches/input/src/orxonox/objects/weaponSystem/weapons:1630-1637
/branches/lodfinal/src/orxonox/objects/weaponSystem/weapons:2373-2412
/branches/miniprojects/src/orxonox/objects/weaponSystem/weapons:2755-2825
/branches/network/src/orxonox/objects/weaponSystem/weapons:2357
/branches/network64/src/orxonox/objects/weaponSystem/weapons:2211-2356
/branches/objecthierarchy/src/orxonox/objects/weaponSystem/weapons:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/weapons:2172-2480
/branches/overlay/src/orxonox/objects/weaponSystem/weapons:2118-2386
/branches/physics/src/orxonox/objects/weaponSystem/weapons:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/objects/weaponSystem/weapons:2437-2458
/branches/pickups/src/orxonox/objects/weaponSystem/weapons:1927-2087,2128
/branches/pickups2/src/orxonox/objects/weaponSystem/weapons:2108-2498
/branches/presentation/src/orxonox/objects/weaponSystem/weapons:2370-2653,2655-2661
/branches/questsystem/src/orxonox/objects/weaponSystem/weapons:1895-2089
/branches/questsystem2/src/orxonox/objects/weaponSystem/weapons:2108-2260
/branches/script_trigger/src/orxonox/objects/weaponSystem/weapons:1296-1954,1956
/branches/weapon/src/orxonox/objects/weaponSystem/weapons:1926-2095
/branches/weapon2/src/orxonox/objects/weaponSystem/weapons:2108-2489
/branches/weaponsystem/src/orxonox/objects/weaponSystem/weapons:2743-2891
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,5 +0,0 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
- Fusion.cc
- LaserGun.cc
-# Missile.cc
-)
Copied: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt (from rev 2918, branches/weapons/src/orxonox/objects/weaponSystem/weapons/CMakeLists.txt)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/CMakeLists.txt 2009-04-18 17:06:36 UTC (rev 2921)
@@ -0,0 +1,4 @@
+ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ FusionFire.cc
+ LaserFire.cc
+)
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.cc 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.cc 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,76 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "Fusion.h"
-
-#include "core/CoreIncludes.h"
-
-#include "objects/weaponSystem/Munition.h"
-#include "objects/weaponSystem/projectiles/ParticleProjectile.h"
-#include "objects/weaponSystem/WeaponSystem.h"
-
-namespace orxonox
-{
- CreateFactory(Fusion);
-
- Fusion::Fusion(BaseObject* creator) : Weapon(creator)
- {
- RegisterObject(Fusion);
-
- this->speed_ = 1250;
-
- }
-
- Fusion::~Fusion()
- {
- }
-
- void Fusion::takeBullets()
- {
-//COUT(0) << "Fusion::takeBullets" << std::endl;
- this->munition_->removeBullets(1);
- this->bulletTimer(this->bulletLoadingTime_);
- }
-
- void Fusion::takeMagazines()
- {
- this->munition_->removeMagazines(1);
- this->magazineTimer(this->magazineLoadingTime_);
- }
-
- void Fusion::createProjectile()
- {
-//COUT(0) << "Fusion::createProjectile" << std::endl;
- BillboardProjectile* projectile = new ParticleProjectile(this);
- projectile->setOrientation(this->getWorldOrientation());
- projectile->setPosition(this->getWorldPosition());
- projectile->setVelocity(this->getWorldOrientation() * WorldEntity::FRONT * this->speed_);
- projectile->setOwner(this->getWeaponSystem()->getPawn());
- }
-}
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/Fusion.h 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Fusion.h 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,53 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _Fusion_H__
-#define _Fusion_H__
-
-#include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/Weapon.h"
-
-namespace orxonox
-{
- class _OrxonoxExport Fusion : public Weapon
- {
- public:
- Fusion(BaseObject* creator);
- virtual ~Fusion();
-
- virtual void takeBullets();
- virtual void takeMagazines();
- virtual void createProjectile();
-
- private:
- float speed_;
-
- };
-}
-
-#endif /* _Fusion_H__ */
Copied: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc (from rev 2919, branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.cc)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.cc 2009-04-18 17:06:36 UTC (rev 2921)
@@ -0,0 +1,68 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Martin Polak
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "FusionFire.h"
+
+#include "core/CoreIncludes.h"
+#include "objects/weaponSystem/projectiles/BillboardProjectile.h"
+
+#include "objects/weaponSystem/Weapon.h"
+#include "objects/weaponSystem/WeaponPack.h"
+#include "objects/weaponSystem/WeaponSystem.h"
+
+namespace orxonox
+{
+ CreateFactory(FusionFire);
+
+ FusionFire::FusionFire(BaseObject* creator) : WeaponMode(creator)
+ {
+ RegisterObject(FusionFire);
+
+ this->reloadTime_ = 1.0;
+ this->bParallelReload_ = false;
+ this->damage_ = 40;
+ this->speed_ = 1250;
+
+ this->setMunitionName("FusionMunition");
+ }
+
+ void FusionFire::fire()
+ {
+ BillboardProjectile* projectile = new BillboardProjectile(this);
+
+ projectile->setOrientation(this->getMuzzleOrientation());
+ projectile->setPosition(this->getMuzzlePosition());
+ projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
+ projectile->scale(5);
+
+ projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ projectile->setDamage(this->getDamage());
+ projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
+ }
+}
Copied: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h (from rev 2918, branches/weapons/src/orxonox/objects/weaponSystem/weapons/FusionFire.h)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/FusionFire.h 2009-04-18 17:06:36 UTC (rev 2921)
@@ -0,0 +1,50 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Martin Polak
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _FusionFire_H__
+#define _FusionFire_H__
+
+#include "OrxonoxPrereqs.h"
+#include "objects/weaponSystem/WeaponMode.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport FusionFire : public WeaponMode
+ {
+ public:
+ FusionFire(BaseObject* creator);
+ virtual ~FusionFire() {}
+
+ virtual void fire();
+
+ private:
+ float speed_;
+ };
+}
+
+#endif /* _FusionFire_H__ */
Copied: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc (from rev 2920, branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.cc 2009-04-18 17:06:36 UTC (rev 2921)
@@ -0,0 +1,65 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Martin Polak
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+#include "LaserFire.h"
+
+#include "core/CoreIncludes.h"
+#include "objects/weaponSystem/projectiles/ParticleProjectile.h"
+
+#include "objects/weaponSystem/Weapon.h"
+#include "objects/weaponSystem/WeaponPack.h"
+#include "objects/weaponSystem/WeaponSystem.h"
+
+namespace orxonox
+{
+ CreateFactory(LaserFire);
+
+ LaserFire::LaserFire(BaseObject* creator) : WeaponMode(creator)
+ {
+ RegisterObject(LaserFire);
+
+ this->reloadTime_ = 0.25;
+ this->damage_ = 15;
+ this->speed_ = 1250;
+
+ this->setMunitionName("LaserMunition");
+ }
+
+ void LaserFire::fire()
+ {
+ ParticleProjectile* projectile = new ParticleProjectile(this);
+
+ projectile->setOrientation(this->getMuzzleOrientation());
+ projectile->setPosition(this->getMuzzlePosition());
+ projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
+
+ projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ projectile->setDamage(this->getDamage());
+ }
+}
Copied: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h (from rev 2918, branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.h)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserFire.h 2009-04-18 17:06:36 UTC (rev 2921)
@@ -0,0 +1,50 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Martin Polak
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _LaserFire_H__
+#define _LaserFire_H__
+
+#include "OrxonoxPrereqs.h"
+#include "objects/weaponSystem/WeaponMode.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport LaserFire : public WeaponMode
+ {
+ public:
+ LaserFire(BaseObject* creator);
+ virtual ~LaserFire() {}
+
+ virtual void fire();
+
+ private:
+ float speed_;
+ };
+}
+
+#endif /* _LaserFire_H__ */
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.cc 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,82 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "LaserGun.h"
-
-#include "core/CoreIncludes.h"
-
-#include "objects/weaponSystem/Munition.h"
-#include "objects/weaponSystem/projectiles/ParticleProjectile.h"
-#include "objects/weaponSystem/WeaponSystem.h"
-
-namespace orxonox
-{
- CreateFactory(LaserGun);
-
- LaserGun::LaserGun(BaseObject* creator) : Weapon(creator)
- {
- RegisterObject(LaserGun);
-
- this->speed_ = 1250;
-
- }
-
- LaserGun::~LaserGun()
- {
- }
-
- void LaserGun::reloadBullet()
- {
- this->bulletTimer(this->bulletLoadingTime_);
- }
-
- void LaserGun::reloadMagazine()
- {
- this->magazineTimer(this->magazineLoadingTime_);
- }
-
- void LaserGun::takeBullets()
- {
- this->munition_->removeBullets(1);
- }
-
- void LaserGun::takeMagazines()
- {
- this->munition_->removeMagazines(1);
- }
-
- void LaserGun::createProjectile()
- {
- BillboardProjectile* projectile = new ParticleProjectile(this);
- projectile->setOrientation(this->getWorldOrientation());
- projectile->setPosition(this->getWorldPosition());
- projectile->setVelocity(this->getWorldOrientation() * WorldEntity::FRONT * this->speed_);
- projectile->setOwner(this->getWeaponSystem()->getPawn());
- }
-}
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserGun.h 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/LaserGun.h 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,55 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _LaserGun_H__
-#define _LaserGun_H__
-
-#include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/Weapon.h"
-
-namespace orxonox
-{
- class _OrxonoxExport LaserGun : public Weapon
- {
- public:
- LaserGun(BaseObject* creator);
- virtual ~LaserGun();
-
- virtual void takeBullets();
- virtual void takeMagazines();
- virtual void createProjectile();
- virtual void reloadBullet();
- virtual void reloadMagazine();
-
- private:
- float speed_;
-
- };
-}
-
-#endif /* _LaserGun_H__ */
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.cc 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.cc 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,51 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "Missile.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
-namespace orxonox
-{
- Missile::Missile(BaseObject* creator) : Weapon(creator)
- {
- RegisterObject(Missile);
- }
-
- Missile::~Missile()
- {
- }
-
- void Missile::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
-
- }
-
-}
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/Missile.h 2009-04-09 22:05:01 UTC (rev 2914)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weaponmodes/Missile.h 2009-04-18 17:06:36 UTC (rev 2921)
@@ -1,52 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Martin Polak
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _Missile_H__
-#define _Missile_H__
-
-#include "OrxonoxPrereqs.h"
-#include "objects/weaponSystem/Weapon.h"
-
-namespace orxonox
-{
- class _OrxonoxExport Missile : public Weapon
- {
- public:
- Missile(BaseObject* creator);
- virtual ~Missile();
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
-
- private:
-
-
- };
-}
-
-#endif /* _Missile_H__ */
More information about the Orxonox-commit
mailing list