Changeset 3969Tweet

Timestamp:

Apr 22, 2015, 6:28:21 PM (8 years ago)

Author:

sam

Message:

sot3000: awesome artwork for the death animation!

Location:

trunk/games/sot3000

Files:

• constants.h (modified) (1 diff)
• data/tiles.png (modified) (previous)
• data/tiles.xcf (modified) (previous)
• level-instance.cpp (modified) (5 diffs)

trunk/games/sot3000/constants.h

@@ -46 +46 @@
     PlayerGoLeft = 1,
 
+    DeadPlayer = 24,
+
     PlusAmmo = 8,
     MinusAmmo = 9,

trunk/games/sot3000/level-instance.cpp

@@ -84 +84 @@
     {
         // FIXME: delta-time this shit!
-        m_player->m_target_scale = min(4.f, m_player->m_target_scale * (1.f + 2.f * seconds));
+        m_player->m_target_scale = min(8.f, m_player->m_target_scale * (1.f + 2.f * seconds));
     }
 
@@ -399 +399 @@
 
         int tid = t->m_tile_index;
+
+        switch (t->get_type())
+        {
+        case thing_type::player:
+            if (m_player_killed)
+                tid = Tiles::DeadPlayer + (lol::sin(20.0 * t->m_time) > 0);
+            break;
+        default:
+            break;
+        }
+
         scene.AddTile(g_game->m_tiles, tid, pos, 0, scale / 3.f, rot);
     }
@@ -603 +614 @@
 void level_instance::impulse_x(float impulse)
 {
-    // FIXME: left/right commands should affect velocity directly so
-    // that we can do more appealing air control.
-    // FIXME: decide whether we run faster when scaled up; I don’t think
-    // it looks cool, but maybe it makes sense for the gameplay?
-    m_player_impulse += vec3(impulse * PLAYER_RUN_SPEED, 0.f, 0.f);
-    //m_player_impulse += vec3(impulse * m_player->m_scale, 0.f, 0.f);
-    //m_player->m_velocity.x += impulse;
-
-    m_player->m_facing_left = impulse < 0.0f;
+    if (!m_player_killed)
+    {
+        // FIXME: left/right commands should affect velocity directly so
+        // that we can do more appealing air control.
+        // FIXME: decide whether we run faster when scaled up; I don’t think
+        // it looks cool, but maybe it makes sense for the gameplay?
+        m_player_impulse += vec3(impulse * PLAYER_RUN_SPEED, 0.f, 0.f);
+        //m_player_impulse += vec3(impulse * m_player->m_scale, 0.f, 0.f);
+        //m_player->m_velocity.x += impulse;
+
+        m_player->m_facing_left = impulse < 0.0f;
+    }
 }
 
 void level_instance::jump()
 {
-    if (m_player->m_grounded)
+    if (!m_player_killed && m_player->m_grounded)
     {
         m_player->m_grounded = false;
@@ -626 +640 @@
 void level_instance::continue_jump(float velocity, float seconds)
 {
-    if (m_player->m_can_impulse)
+    if (!m_player_killed && m_player->m_can_impulse)
     {
         // We can jump higher when scaled up!
@@ -645 +659 @@
 void level_instance::fire()
 {
-    if (m_active_ammo != thing_type::none)
+    if (!m_player_killed && m_active_ammo != thing_type::none)
     {
         thing *projecile = m_projectiles[0];