[Orxonox-commit 272] r2920 - in branches/weapons/src/orxonox: . objects/weaponSystem/munitions objects/weaponSystem/weapons
landauf at orxonox.net
landauf at orxonox.net
Sat Apr 18 18:59:02 CEST 2009
Author: landauf
Date: 2009-04-18 18:59:02 +0200 (Sat, 18 Apr 2009)
New Revision: 2920
Added:
branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc
branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h
Removed:
branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc
branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h
Modified:
branches/weapons/src/orxonox/OrxonoxPrereqs.h
branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt
branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc
Log:
renamed LaserGunMunition as LaserMunition
Modified: branches/weapons/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- branches/weapons/src/orxonox/OrxonoxPrereqs.h 2009-04-18 16:41:00 UTC (rev 2919)
+++ branches/weapons/src/orxonox/OrxonoxPrereqs.h 2009-04-18 16:59:02 UTC (rev 2920)
@@ -164,7 +164,7 @@
class ReplenishingMunition;
class Munition;
- class LaserGunMunition;
+ class LaserMunition;
class FusionMunition;
class EventListener;
Modified: branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt 2009-04-18 16:41:00 UTC (rev 2919)
+++ branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt 2009-04-18 16:59:02 UTC (rev 2920)
@@ -1,5 +1,5 @@
ADD_SOURCE_FILES(ORXONOX_SRC_FILES
ReplenishingMunition.cc
- LaserGunMunition.cc
+ LaserMunition.cc
FusionMunition.cc
)
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc 2009-04-18 16:41:00 UTC (rev 2919)
+++ branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc 2009-04-18 16:59:02 UTC (rev 2920)
@@ -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:
- * ...
- *
- */
-
-#include "OrxonoxStableHeaders.h"
-#include "LaserGunMunition.h"
-
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
- CreateFactory(LaserGunMunition);
-
- LaserGunMunition::LaserGunMunition(BaseObject* creator) : ReplenishingMunition(creator)
- {
- RegisterObject(LaserGunMunition);
-
- this->maxMunitionPerMagazine_ = 20;
- this->maxMagazines_ = 1;
- this->magazines_ = 1;
-
- this->bUseSeparateMagazines_ = false;
- this->bStackMunition_ = true;
-
- this->bAllowMunitionRefilling_ = true;
- this->bAllowMultiMunitionRemovementUnderflow_ = true;
-
- this->replenishIntervall_ = 0.5f;
- this->replenishMunitionAmount_ = 1;
- }
-}
Deleted: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h 2009-04-18 16:41:00 UTC (rev 2919)
+++ branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h 2009-04-18 16:59:02 UTC (rev 2920)
@@ -1,45 +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 _LaserGunMunition_H__
-#define _LaserGunMunition_H__
-
-#include "OrxonoxPrereqs.h"
-#include "ReplenishingMunition.h"
-
-namespace orxonox
-{
- class _OrxonoxExport LaserGunMunition : public ReplenishingMunition
- {
- public:
- LaserGunMunition(BaseObject* creator);
- virtual ~LaserGunMunition() {}
- };
-}
-
-#endif /* _LaserGunMunition_H__ */
Copied: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc (from rev 2918, branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc 2009-04-18 16:59:02 UTC (rev 2920)
@@ -0,0 +1,55 @@
+/*
+ * 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 "LaserMunition.h"
+
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ CreateFactory(LaserMunition);
+
+ LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator)
+ {
+ RegisterObject(LaserMunition);
+
+ this->maxMunitionPerMagazine_ = 20;
+ this->maxMagazines_ = 1;
+ this->magazines_ = 1;
+
+ this->bUseSeparateMagazines_ = false;
+ this->bStackMunition_ = true;
+
+ this->bAllowMunitionRefilling_ = true;
+ this->bAllowMultiMunitionRemovementUnderflow_ = true;
+
+ this->replenishIntervall_ = 0.5f;
+ this->replenishMunitionAmount_ = 1;
+ }
+}
Property changes on: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc
___________________________________________________________________
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Copied: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h (from rev 2918, branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h)
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h (rev 0)
+++ branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h 2009-04-18 16:59:02 UTC (rev 2920)
@@ -0,0 +1,45 @@
+/*
+ * 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 _LaserMunition_H__
+#define _LaserMunition_H__
+
+#include "OrxonoxPrereqs.h"
+#include "ReplenishingMunition.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport LaserMunition : public ReplenishingMunition
+ {
+ public:
+ LaserMunition(BaseObject* creator);
+ virtual ~LaserMunition() {}
+ };
+}
+
+#endif /* _LaserMunition_H__ */
Property changes on: branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h
___________________________________________________________________
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Modified: branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc
===================================================================
--- branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc 2009-04-18 16:41:00 UTC (rev 2919)
+++ branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc 2009-04-18 16:59:02 UTC (rev 2920)
@@ -48,7 +48,7 @@
this->damage_ = 15;
this->speed_ = 1250;
- this->setMunitionName("LaserGunMunition");
+ this->setMunitionName("LaserMunition");
}
void LaserFire::fire()
More information about the Orxonox-commit
mailing list