projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make tux and yeti dying state not reveal secret tilemaps
[supertux.git]
/
src
/
badguy
/
yeti.cpp
diff --git
a/src/badguy/yeti.cpp
b/src/badguy/yeti.cpp
index
97891c7
..
8d1b49b
100644
(file)
--- a/
src/badguy/yeti.cpp
+++ b/
src/badguy/yeti.cpp
@@
-62,8
+62,8
@@
Yeti::Yeti(const Reader& reader) :
{
hit_points = INITIAL_HITPOINTS;
countMe = false;
{
hit_points = INITIAL_HITPOINTS;
countMe = false;
-
sound_manager
->preload("sounds/yeti_gna.wav");
-
sound_manager
->preload("sounds/yeti_roar.wav");
+
SoundManager::current()
->preload("sounds/yeti_gna.wav");
+
SoundManager::current()
->preload("sounds/yeti_roar.wav");
hud_head = Surface::create("images/creatures/yeti/hudlife.png");
}
hud_head = Surface::create("images/creatures/yeti/hudlife.png");
}
@@
-93,14
+93,12
@@
Yeti::draw(DrawingContext& context)
void
Yeti::draw_hit_points(DrawingContext& context)
{
void
Yeti::draw_hit_points(DrawingContext& context)
{
- int i;
-
if (hud_head)
{
context.push_transform();
context.set_translation(Vector(0, 0));
if (hud_head)
{
context.push_transform();
context.set_translation(Vector(0, 0));
- for (i = 0; i < hit_points; ++i)
+ for (i
nt i
= 0; i < hit_points; ++i)
{
context.draw_surface(hud_head, Vector(BORDER_X + (i * hud_head->get_width()), BORDER_Y + 1), LAYER_FOREGROUND1);
}
{
context.draw_surface(hud_head, Vector(BORDER_X + (i * hud_head->get_width()), BORDER_Y + 1), LAYER_FOREGROUND1);
}
@@
-126,7
+124,7
@@
Yeti::active_update(float elapsed_time)
break;
case BE_ANGRY:
if(state_timer.check()) {
break;
case BE_ANGRY:
if(state_timer.check()) {
-
sound_manager
->play("sounds/yeti_gna.wav");
+
SoundManager::current()
->play("sounds/yeti_gna.wav");
physic.set_velocity_y(STOMP_VY);
sprite->set_action((dir==RIGHT)?"stomp-right":"stomp-left");
}
physic.set_velocity_y(STOMP_VY);
sprite->set_action((dir==RIGHT)?"stomp-right":"stomp-left");
}
@@
-205,7
+203,7
@@
void Yeti::take_hit(Player& )
if(safe_timer.started())
return;
if(safe_timer.started())
return;
-
sound_manager
->play("sounds/yeti_roar.wav");
+
SoundManager::current()
->play("sounds/yeti_roar.wav");
hit_points--;
if(hit_points <= 0) {
hit_points--;
if(hit_points <= 0) {
@@
-214,6
+212,9
@@
void Yeti::take_hit(Player& )
physic.set_velocity_x(0);
physic.set_velocity_y(0);
physic.set_velocity_x(0);
physic.set_velocity_y(0);
+ // Set the badguy layer to be above the foremost, so that
+ // this does not reveal secret tilemaps:
+ layer = Sector::current()->get_foremost_layer() + 1;
state = SQUISHED;
state_timer.start(YETI_SQUISH_TIME);
set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
state = SQUISHED;
state_timer.start(YETI_SQUISH_TIME);
set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
@@
-244,19
+245,18
@@
Yeti::drop_stalactite()
Sector* sector = Sector::current();
for(Sector::GameObjects::iterator i = sector->gameobjects.begin();
i != sector->gameobjects.end(); ++i) {
Sector* sector = Sector::current();
for(Sector::GameObjects::iterator i = sector->gameobjects.begin();
i != sector->gameobjects.end(); ++i) {
- YetiStalactite* stalactite = dynamic_cast<YetiStalactite*>
(*i
);
+ YetiStalactite* stalactite = dynamic_cast<YetiStalactite*>
(i->get()
);
if(stalactite && stalactite->is_hanging()) {
if(stalactite && stalactite->is_hanging()) {
- float distancex;
if (hit_points >= 3) {
// drop stalactites within 3 of player, going out with each jump
if (hit_points >= 3) {
// drop stalactites within 3 of player, going out with each jump
- distancex = fabsf(stalactite->get_bbox().get_middle().x - player->get_bbox().get_middle().x);
+
float
distancex = fabsf(stalactite->get_bbox().get_middle().x - player->get_bbox().get_middle().x);
if(distancex < stomp_count*32) {
stalactite->start_shaking();
}
}
else { /* if (hitpoints < 3) */
if(distancex < stomp_count*32) {
stalactite->start_shaking();
}
}
else { /* if (hitpoints < 3) */
- // drop every 3rd
stalactite
- if(((((int)stalactite->get_pos().x + 16) /
32
) % 3) == (stomp_count % 3)) {
+ // drop every 3rd
pair of stalactites
+ if(((((int)stalactite->get_pos().x + 16) /
64
) % 3) == (stomp_count % 3)) {
stalactite->start_shaking();
}
}
stalactite->start_shaking();
}
}