Changeset 9900 for code/branches/presentationHS13/src/modules

Timestamp:

Dec 16, 2013, 1:33:09 PM (11 years ago)

Author:

smerkli

Message:

Merged the invaders branch of Florian

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/invader (copied) (copied from code/branches/invaders/src/modules/invader)
• src/modules/invader/CMakeLists.txt (copied) (copied from code/branches/invaders/src/modules/invader/CMakeLists.txt)
• src/modules/invader/Invader.cc (copied) (copied from code/branches/invaders/src/modules/invader/Invader.cc)
• src/modules/invader/Invader.h (copied) (copied from code/branches/invaders/src/modules/invader/Invader.h)
• src/modules/invader/InvaderCenterPoint.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderCenterPoint.cc)
• src/modules/invader/InvaderCenterPoint.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderCenterPoint.h)
• src/modules/invader/InvaderEnemy.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderEnemy.cc)
• src/modules/invader/InvaderEnemy.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderEnemy.h)
• src/modules/invader/InvaderEnemyShooter.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderEnemyShooter.cc)
• src/modules/invader/InvaderEnemyShooter.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderEnemyShooter.h)
• src/modules/invader/InvaderHUDinfo.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderHUDinfo.cc)
• src/modules/invader/InvaderHUDinfo.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderHUDinfo.h)
• src/modules/invader/InvaderPrereqs.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderPrereqs.h)
• src/modules/invader/InvaderShip.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderShip.cc)
• src/modules/invader/InvaderShip.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderShip.h)
• src/modules/invader/InvaderWeapon.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderWeapon.cc)
• src/modules/invader/InvaderWeapon.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderWeapon.h)
• src/modules/invader/InvaderWeaponEnemy.cc (copied) (copied from code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.cc)
• src/modules/invader/InvaderWeaponEnemy.h (copied) (copied from code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.h)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)

code/branches/presentationHS13/src/modules/CMakeLists.txt

@@ -39 +39 @@
 ADD_SUBDIRECTORY(docking)
 ADD_SUBDIRECTORY(towerdefense)
+ADD_SUBDIRECTORY(invader)

code/branches/presentationHS13/src/modules/weapons/weaponmodes/HsW01.h

@@ -59 +59 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-        private:
+        protected:
             /**
             @brief Set the mesh.
@@ -109 +109 @@
                 { return this->delay_; }
 
-            void shot();
+            virtual void shot();
             void muzzleflash();