@@ -39,8 +39,9 @@ Ghoul::Ghoul(const ReaderMapping& reader) :
39
39
reader.get (" speed" , m_speed, DEFAULT_SPEED);
40
40
reader.get (" track-range" , m_track_range, DEFAULT_TRACK_RANGE);
41
41
42
- m_sprite-> set_action (m_dir);
42
+ set_action (m_dir);
43
43
m_physic.set_gravity_modifier (0 .2f );
44
+ set_colgroup_active (COLGROUP_TOUCHABLE);
44
45
45
46
SoundManager::current ()->preload (" sounds/fall.wav" );
46
47
}
@@ -55,7 +56,7 @@ Ghoul::active_update(float dt_sec)
55
56
if (m_fake_dead && m_respawn_timer.check ()) {
56
57
initialize ();
57
58
m_physic.enable_gravity (true );
58
- set_colgroup_active (COLGROUP_MOVING );
59
+ set_colgroup_active (COLGROUP_TOUCHABLE );
59
60
m_fake_dead = false ;
60
61
m_respawn_timer.stop ();
61
62
}
@@ -77,14 +78,14 @@ Ghoul::active_update(float dt_sec)
77
78
{
78
79
case NORMAL:
79
80
m_speed_modifier = std::max (0 .f , m_speed_modifier - (dt_sec * 2 .f ));
80
- m_sprite-> set_action (player->get_bbox ().get_middle ().x < get_bbox ().get_middle ().x ? " normal- left" : " normal- right" , 1 );
81
+ set_action (player->get_bbox ().get_middle ().x < get_bbox ().get_middle ().x ? " left" : " right" , 1 );
81
82
if (m_sprite->animation_done ()) {
82
83
m_chase_dir = glm::normalize (dist);
83
84
m_sprite_state = SpriteState::FAST;
84
85
}
85
86
break ;
86
87
case FAST:
87
- m_sprite-> set_action (player->get_bbox ().get_middle ().x < get_bbox ().get_middle ().x ? " fast-left" : " fast-right" , 1 );
88
+ set_action (player->get_bbox ().get_middle ().x < get_bbox ().get_middle ().x ? " fast-left" : " fast-right" , 1 );
88
89
m_speed_modifier = 3 .5f ;
89
90
if (m_sprite->animation_done ()) {
90
91
m_sprite_state = SpriteState::NORMAL;
0 commit comments