From 55a19b5e43db960fc04773eb7f22edd86eac0e6c Mon Sep 17 00:00:00 2001
From: Marek Moeckel <wansti@gmx.de>
Date: Thu, 25 Nov 2004 13:19:51 +0000
Subject: [PATCH] added (temporary) dispenser sprites improved nolok code

SVN-Revision: 2186
---
 data/images/shared/dispenser-broken.png  | Bin 0 -> 943 bytes
 data/images/shared/dispenser-working.png | Bin 0 -> 834 bytes
 data/images/supertux.strf                |  15 +++++++++++++-
 src/badguy/dispenser.cpp                 |   9 +++++----
 src/badguy/nolok_01.cpp                  |  33 +++++++++++++++++++------------
 src/badguy/nolok_01.h                    |   4 ++--
 6 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 data/images/shared/dispenser-broken.png
 create mode 100644 data/images/shared/dispenser-working.png

diff --git a/data/images/shared/dispenser-broken.png b/data/images/shared/dispenser-broken.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbd6dccdb0247632f0334644cfe7fc2fb0b88aea
GIT binary patch
literal 943
zcmV;g15o^lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI33
z00XFKlMny^010qNS#tmY3ljhU3ljkVnw%H_000McNliru)C(C5CLS+wn!W%403CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00R?AL_t(o!^Kv;ZWBQe
z{$}qkc4Ff|a7ZK+M<@lNK&j}c>F7}C5$}L_0-hyE^mM!eG-;4f3M8ULAr?_$d;f;Q
zYkTj!yFNz|taRGD-Pzfh?`FOkf*X%tJ>lJFkI=rijyoIcXm51T+GwL#S%J|ST59N#
zgc@lmDWQiFN-C(4f*MJ;rrer@8Y$@MyL562T1pHq1~~n4MgSl%H`qP12@DY8gCc9}
z>xjse4B+X#&Im4>6&oD5f>S3rXh7<UiE2XqQBPLHujjPsb+MqdZK8UXaXW*-<9oO!
z0#!$tZvrb#CraVUsUYNf5QlB@VWi2FbV1C!?i=D162%eVlzN)&Q=MN>#fR$#UpNL3
z0|(I{<fURhl>PoH)rcZ-I}smJ&&%;Z^%#51SVtEH5U689-t0Bj?a;owJo$r@qhDyY
z`e?RR(QK`v(P|<ua#&+wjfK$$Mr#=5W^KGR4Wq61?(O;Kl!3aED7wX)Y)yQk_Fn7j
z&hy><t-XhM(A!3LXA7O~T@VqB(ojl6OXZ%(yVi4S%HN;pP%{~MEphq%@|!3+#eP;~
zOHw!`<vBzT6*-X;@^-#2Jo36x*oD%SLixmDKSV52*fX4x$wa}*Q#wOo_edntkfxsS
z;!1hL3dR-?l+gmH7Uj0zE^$~YVW42k9ENk5=4%lr#6if1XT!t(asRcw0u4?F`2FJ?
ztL?RM8X5zu$N6uKao^+owtD<M-m|dU@qn4_&B;1_RvT!kSzV~Zsrd&0zsoW(09$z&
zfN`@Wz_>qU6OVt!0AK<v6D$~?jlo9;lxX%EI6$y;r|CKJd&w1{AQyN6eE@K?*MP{2
z902g%d7tV@sM>Nz$}lH5hyc9EGMAkMQFMyA)SFLRnnNOx?90*@@^+3A6LPf6VT5`j
z_A`*mMVTn<eUu3&!c1X{IY54tYMQvb&$XG5BfxXCaau^_DJIM(O!&bV{Ev~dWgNYI
zN}IiHZ1%R%?QNlRe~ErTX;<e}q9<@Ns=SY%*T{!wL-ddPuvfr8W<sb7g}=ctlSX&1
Rk?H^d002ovPDHLkV1hJntxx~}

literal 0
HcmV?d00001

diff --git a/data/images/shared/dispenser-working.png b/data/images/shared/dispenser-working.png
new file mode 100644
index 0000000000000000000000000000000000000000..c36e65567072b08a297c243f0f83a0c3d91e093c
GIT binary patch
literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)C(C5BO4-YnsfjF03CEi
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00O2-L_t(o!|hhhZWA#O
z{>Ir&(qx;Ks8A%-7F3C!Q!jAi!UJ$YNZfh59(V?L1h{aignFZDL>m#6Y&^Dy!@7x^
zcsHA>YA?04@~%BIp80m>^AP-a@$r@Hy?KW0!3Ng*8_4=Sbo&|7W)s#J7;RuC8ay#z
ztzmKv)(oC7c%uCp`!x-oFwFE_dpU;D8sqaZPQMNa02CI6_-8gj07Chok~Il!l*nCi
zK&Iz<C*-PIWkVuINR@^}9jH3u(lnv|s3)t+kC$rK>taFGzNvX#!OaYT6z51y1m*(~
zxelx}ou~>|sY*hr2XWk|5JtM3Dnn3<p@)umgGA*BNR@e-?Ngm!FprPaO}=;zpbQ+8
zCZVj9^Rem=SE)u8shi38n0Z-^2j<lzV8%MOD1ty87n1gFYs2O4{pjQ`PJaGIyE{a?
zyM}gm4Xth)Nt(b}2WK6uv9QL#vY(9&)(ot1!F#Y5>ahi1Xrx=|=SD|;p=`hVedq1o
z!S?<WJlcJXt(|T3wl+aTux!9=U^M%u<lUHsH4gVLZSYJ+|I-*9jee-KmmW0I#)=e9
zmGTm!hdDWw5Rxo8Pyu;eEA3+CO0jy9cpR!MQzUSlDvODtH_sIviibz4q6}#oi7dY<
zuX%%s0~9rA2~^8!J8YLEE>+>65+@RebCu?687Gv3kmQ5>aCkiY<Sszt(=pC|{lQw+
zDaz1VI8)TWv(|qX_3cdYUF<nH<9Wc&_7-HlJ!dS8Hp1t8ICcN|hnLuW{S;Y0=!!Sj
z(dx7cVqr7wY-3%q(HcD06|-h9=euODJ3brZ^xI&{gmAgT9WWsp9fc%G6YRX(!|gI*
z6U~QBjE+W7X)nbcG9m7n@SX{kIKdq<A(DKMV|YA-y8v#P3Bl)#|ExORj)#W!=Kufz
M07*qoM6N<$g3~W{BLDyZ

literal 0
HcmV?d00001

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index f689b0540..85c185e7d 100644
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -1107,7 +1107,20 @@
           (x-offset 0)
           (y-offset 0)
           (images "shared/walkingtree-left-small-1.png")))
-          
+         
+  ; Dispenser
+  (sprite (name "dispenser")
+       (action
+         (name "working")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/dispenser-working.png"))
+       (action
+          (name "broken")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/dispenser-broken.png")))          
+   
    ; Dummyguy
    (sprite (name "dummyguy")
        (action
diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index 2975c1a89..953a32137 100644
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -12,9 +12,8 @@ Dispenser::Dispenser(LispReader& reader)
   reader.read_float("cycle", cycle);
   reader.read_string("badguy", badguy);
   bbox.set_size(32, 32);
-  //FIXME: Create dispenser sprite
-  sprite = sprite_manager->create("dummyguy");
-  sprite->set_action("stand");
+  sprite = sprite_manager->create("dispenser");
+  sprite->set_action("working");
 }
 
 void
@@ -40,7 +39,9 @@ Dispenser::activate()
 bool
 Dispenser::collision_squished(Player& player)
 {
-  remove_me();
+  //FIXME: Should act like a normal tile when killed
+  sprite->set_action("broken");
+  dispense_timer.start(0);
   player.bounce(*this);
   return true;
 }
diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 4bbc14e73..180ee839d 100644
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -44,7 +44,8 @@ Nolok_01::activate()
 {
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
-  action_timer.start(SHOOT_TIME, true);
+  action = WALKING;
+  action_timer.start(SHOOT_TIME);
 }
 
 void
@@ -52,18 +53,24 @@ Nolok_01::active_action(float elapsed_time)
 {
    movement = physic.get_movement(elapsed_time);
    if (action_timer.check()) {
-      physic.set_velocity_y(700);
-      jump_timer.start(JUMP_TIME);
-   }
-   if (jump_timer.check()) {
-      sprite->set_action("throw");
-      idle_timer.start(IDLE_TIME);
-   }
-   if (idle_timer.check()) {
-      Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT));
-      Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT));
-      physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-      sprite->set_action(dir == LEFT ? "left" : "right");
+     if (action == WALKING) {
+        physic.set_velocity_y(700);
+        action = JUMPING;
+        action_timer.start(JUMP_TIME);
+     }
+     else if (action == JUMPING) {
+        sprite->set_action("throw");
+        action = IDLE;
+        action_timer.start(IDLE_TIME);
+     }
+     else if (action == IDLE) {
+        Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT));
+        Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT));
+        physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+        sprite->set_action(dir == LEFT ? "left" : "right");
+        action = WALKING;
+        action_timer.start(SHOOT_TIME);
+     }
    }
 }
 
diff --git a/src/badguy/nolok_01.h b/src/badguy/nolok_01.h
index 4049892db..ff32034f4 100644
--- a/src/badguy/nolok_01.h
+++ b/src/badguy/nolok_01.h
@@ -18,8 +18,8 @@ public:
 protected:
   bool collision_squished(Player& player);
   Timer2 action_timer;
-  Timer2 idle_timer;
-  Timer2 jump_timer;
+  enum { IDLE, WALKING, JUMPING, SHOOTING };
+  int action;
 };
 
 #endif
-- 
2.11.0