From e5f99ba473f018fa9185385d96ebff0efcb2c925 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ond=C5=99ej=20Ho=C5=A1ek?= <ondra.hosek@gmail.com>
Date: Sun, 28 Jan 2007 17:58:50 +0000
Subject: [PATCH] B118: visual indication of Yeti's hitpoints. The scaled down
 image of the Yeti's head is pretty ugly; please replace.

SVN-Revision: 4710
---
 data/images/creatures/yeti/hudlife.png | Bin 0 -> 2646 bytes
 src/badguy/yeti.cpp                    |  23 +++++++++++++++++++++++
 src/badguy/yeti.hpp                    |   7 ++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 data/images/creatures/yeti/hudlife.png

diff --git a/data/images/creatures/yeti/hudlife.png b/data/images/creatures/yeti/hudlife.png
new file mode 100644
index 0000000000000000000000000000000000000000..517da36dc56e6a529688ea42bcea4d228fbc2e09
GIT binary patch
literal 2646
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
Ef)D!cF#rGn

literal 0
HcmV?d00001

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index 76f0faa69..5578d0d71 100644
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -59,6 +59,7 @@ Yeti::Yeti(const lisp::Lisp& reader)
   countMe = false;
   sound_manager->preload("sounds/yeti_gna.wav");
   sound_manager->preload("sounds/yeti_roar.wav");
+  hud_head.reset(new Surface("images/creatures/yeti/hudlife.png"));
   draw_dead_script_hint = false;
 }
 
@@ -80,10 +81,32 @@ Yeti::draw(DrawingContext& context)
   if(safe_timer.started() && size_t(game_time*40)%2)
     return;
 
+  draw_hit_points(context);
+
   BadGuy::draw(context);
 }
 
 void
+Yeti::draw_hit_points(DrawingContext& context)
+{
+  int i;
+
+  Surface *hh = hud_head.get();
+  if (!hh)
+    return;
+
+  context.push_transform();
+  context.set_translation(Vector(0, 0));
+
+  for (i = 0; i < hit_points; ++i)
+  {
+    context.draw_surface(hh, Vector(BORDER_X + (i * hh->get_width()), BORDER_Y + 1), LAYER_FOREGROUND1);
+  }
+
+  context.pop_transform();
+}
+
+void
 Yeti::active_update(float elapsed_time)
 {
   switch(state) {
diff --git a/src/badguy/yeti.hpp b/src/badguy/yeti.hpp
index f1b750482..cfc6d055d 100644
--- a/src/badguy/yeti.hpp
+++ b/src/badguy/yeti.hpp
@@ -21,6 +21,8 @@
 #ifndef __YETI_H__
 #define __YETI_H__
 
+#include <memory>
+
 #include "badguy.hpp"
 
 class Yeti : public BadGuy
@@ -38,7 +40,7 @@ public:
   void kill_squished(GameObject& object);
   void kill_fall();
 
-  virtual Yeti* clone() const { return new Yeti(*this); }
+  virtual Yeti* clone() const { return new Yeti((Yeti&)*this); }
 
 private:
   void run();
@@ -48,6 +50,8 @@ private:
   void summon_snowball();
   void jump_down();
 
+  void draw_hit_points(DrawingContext& context);
+
   void take_hit(Player& player);
 
   enum YetiState {
@@ -62,6 +66,7 @@ private:
   Timer safe_timer;
   int stomp_count;
   int hit_points;
+  std::auto_ptr<Surface> hud_head;
 };
 
 #endif
-- 
2.11.0