Changeset 11199 for code/branches/presentationFS16/src/modules/invader/Invader.cc

Timestamp:

May 26, 2016, 3:13:51 PM (8 years ago)

Author:

fvultier

Message:

merged branch hover

File:

• code/branches/presentationFS16/src/modules/invader/Invader.cc (modified) (1 diff)

code/branches/presentationFS16/src/modules/invader/Invader.cc

@@ -71 +71 @@
         // spawn enemy every 3.5 seconds
         enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
-        comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
+        comboTimer.setTimer(3.0f, false, createExecutor(createFunctor(&Invader::comboControll, this)));
         this->setHUDTemplate("InvaderHUD");
     }