Changeset 10078

Timestamp:

May 27, 2014, 10:35:27 AM (11 years ago)

Author:

smerkli

Message:

Merged Jump minigame, tested, works.

Location:

code/branches/presentationFS14

Files:

• data/levels/jump.oxw (added)
• data/overlays/jumpHUD.oxo (added)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/invader/InvaderWeapon.cc (modified) (1 diff)
• src/modules/jump (added)
• src/modules/jump/CMakeLists.txt (added)
• src/modules/jump/Jump.cc (added)
• src/modules/jump/Jump.h (added)
• src/modules/jump/JumpBoots.cc (added)
• src/modules/jump/JumpBoots.h (added)
• src/modules/jump/JumpCenterpoint.cc (added)
• src/modules/jump/JumpCenterpoint.h (added)
• src/modules/jump/JumpEnemy.cc (added)
• src/modules/jump/JumpEnemy.h (added)
• src/modules/jump/JumpFigure.cc (added)
• src/modules/jump/JumpFigure.h (added)
• src/modules/jump/JumpItem.cc (added)
• src/modules/jump/JumpItem.h (added)
• src/modules/jump/JumpPlatform.cc (added)
• src/modules/jump/JumpPlatform.h (added)
• src/modules/jump/JumpPlatformDisappear.cc (added)
• src/modules/jump/JumpPlatformDisappear.h (added)
• src/modules/jump/JumpPlatformFake.cc (added)
• src/modules/jump/JumpPlatformFake.h (added)
• src/modules/jump/JumpPlatformHMove.cc (added)
• src/modules/jump/JumpPlatformHMove.h (added)
• src/modules/jump/JumpPlatformStatic.cc (added)
• src/modules/jump/JumpPlatformStatic.h (added)
• src/modules/jump/JumpPlatformTimer.cc (added)
• src/modules/jump/JumpPlatformTimer.h (added)
• src/modules/jump/JumpPlatformVMove.cc (added)
• src/modules/jump/JumpPlatformVMove.h (added)
• src/modules/jump/JumpPrereqs.h (added)
• src/modules/jump/JumpProjectile.cc (added)
• src/modules/jump/JumpProjectile.h (added)
• src/modules/jump/JumpPropeller.cc (added)
• src/modules/jump/JumpPropeller.h (added)
• src/modules/jump/JumpRocket.cc (added)
• src/modules/jump/JumpRocket.h (added)
• src/modules/jump/JumpScore.cc (added)
• src/modules/jump/JumpScore.h (added)
• src/modules/jump/JumpShield.cc (added)
• src/modules/jump/JumpShield.h (added)
• src/modules/jump/JumpSpring.cc (added)
• src/modules/jump/JumpSpring.h (added)

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

@@ -40 +40 @@
 ADD_SUBDIRECTORY(towerdefense)
 ADD_SUBDIRECTORY(invader)
+ADD_SUBDIRECTORY(jump)

code/branches/presentationFS14/src/modules/invader/InvaderWeapon.cc

@@ -57 +57 @@
     }
 
-    InvaderWeapon::~InvaderWeapon(){}
+    InvaderWeapon::~InvaderWeapon()
+    {
+
+    }
 
     void InvaderWeapon::shot()