From 1640902e21147573c8638d2167426dc5afb78555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Mon, 14 Oct 2019 13:31:13 +0200
Subject: [PATCH] Add rocket

---
 assets.h                         |  45 ++++++++++++++++++++++++++
 assets/weapon_rocketlauncher.png | Bin 0 -> 960 bytes
 main.c                           |  54 +++++++++++++++++++++++--------
 3 files changed, 86 insertions(+), 13 deletions(-)
 create mode 100644 assets/weapon_rocketlauncher.png

diff --git a/assets.h b/assets.h
index 14b5434..5578140 100644
--- a/assets.h
+++ b/assets.h
@@ -632,6 +632,51 @@ uint8_t SFG_weaponImages[][SFG_TEXTURE_SIZE * SFG_TEXTURE_SIZE] =
 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,1,1,175,
 175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
 175,175,175,175,175,175,175,175,175,175,175
+  },
+  { // 1, rocket launcher
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,0,0,0,0,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,0,0,0,0,5,4,2,2,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,0,6,6,6,5,4,2,142,141,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,0,4,4,4,4,4,2,142,141,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,0,3,
+3,3,3,3,3,2,1,175,175,175,175,175,175,175,175,175,175,175,0,0,0,0,175,175,175,
+175,175,175,175,0,0,1,1,1,1,1,1,1,1,175,175,175,175,175,175,175,175,0,0,0,2,2,2,
+2,0,0,175,0,0,0,0,118,118,118,116,1,1,114,114,114,1,175,175,175,175,175,175,0,0,
+5,5,2,2,2,2,50,50,2,0,117,117,118,118,117,116,116,115,114,1,114,114,36,36,175,
+175,175,175,175,0,5,5,2,2,2,2,2,115,116,116,116,117,116,116,116,115,115,115,115,
+116,115,6,116,116,117,117,175,175,175,175,0,20,5,2,2,2,2,115,115,115,115,115,
+115,115,115,116,116,116,116,116,117,116,6,117,117,117,117,117,175,175,175,0,20,
+23,2,2,2,2,115,116,116,117,116,116,116,116,116,116,117,117,117,37,37,36,6,37,37,
+38,38,38,175,175,175,0,23,23,2,2,2,117,117,117,117,117,117,117,117,117,117,37,
+37,38,38,5,36,6,38,39,38,38,39,38,175,175,175,0,7,2,2,2,115,117,37,37,37,37,37,
+37,37,37,37,6,6,6,6,6,4,7,6,6,6,6,6,6,175,175,0,23,7,2,2,2,117,38,45,45,5,5,5,6,
+6,6,6,6,6,6,6,39,4,7,6,39,39,39,39,39,175,175,0,7,7,2,2,2,117,39,39,39,39,7,7,7,
+7,7,7,7,7,7,7,7,5,7,7,7,7,7,7,25,175,175,0,7,7,2,2,2,117,39,39,7,7,7,7,7,7,7,7,
+7,7,7,7,7,5,7,7,7,7,7,25,100,175,175,0,23,7,2,2,2,117,37,37,37,37,37,38,38,38,
+38,38,38,38,38,39,39,37,7,39,39,39,25,109,30,175,175,0,5,7,2,2,2,35,35,36,36,36,
+36,36,36,36,117,117,117,118,118,37,37,36,6,38,38,38,25,30,21,175,175,0,5,23,2,2,
+2,115,115,115,115,115,115,115,116,116,116,116,116,116,117,117,36,116,6,36,37,37,
+25,109,109,175,175,175,0,23,2,2,2,2,115,115,115,115,115,115,115,115,115,115,115,
+115,115,116,116,115,6,116,116,36,25,109,21,175,175,175,0,5,20,2,2,2,33,114,114,
+114,115,115,115,115,115,115,115,115,115,115,115,115,6,115,115,115,25,109,21,175,
+175,175,0,5,5,2,2,2,2,33,33,114,114,114,114,114,114,114,114,115,115,115,115,115,
+115,6,115,115,25,109,21,175,175,175,175,0,5,5,2,2,2,2,33,1,1,33,33,33,33,33,114,
+114,114,114,114,114,115,6,115,115,25,30,21,175,175,175,175,175,0,5,5,2,2,2,2,2,
+41,1,40,41,34,34,41,33,33,33,33,114,114,115,6,114,25,30,21,175,175,175,175,175,
+175,0,0,5,5,2,2,2,2,2,2,2,0,1,41,34,49,49,33,33,33,115,6,114,25,109,21,175,175,
+175,175,175,175,175,175,0,0,0,2,2,2,2,0,0,175,0,0,0,0,49,33,41,41,34,41,6,25,30,
+21,175,175,175,175,175,175,175,175,175,175,175,0,0,0,0,175,175,175,175,175,175,
+175,0,0,0,0,57,42,116,25,109,21,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,0,0,0,25,21,21,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,0,100,21,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,0,
+100,100,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,0,107,175,175,175,175,175,175,
+175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,175,
+175,175,175,175,175,0
   }
 };
 
diff --git a/assets/weapon_rocketlauncher.png b/assets/weapon_rocketlauncher.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e58ddadcb1fccfb7957b3f45c2e5f0bf4cc841c
GIT binary patch
literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|dN73N=<@Z&m;R02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00SsVL_t(o!^M{&klQ#Ig}-(R
z1PTld0t5mA4j2>!ED%^=P+)K%aG^m#VPQbQf`bPZE?gK;U}zAq(4asdKp?=NK;VGD
z&9p$aV<#)e$=*#h<C!>?^gq4#|4-5z2S53Z?Jd8#y}M?R2>kE<PXPU(ZubN-^DkyY
zq5W6!F}oPdn<+UUfXDls)t~AR__&!3KnEuKm`wt47Qi4lkbQa_op7Zj(I4q#5TgJD
zu=(a!_VD+^McU?{@<|{jRl%jfFBubLpk4j(M0RPADjs$&BMh48S-!}`7z-DbVf4ij
z5tGV{c;-P=TTMmPfwLt@A^#gA>aX4|4FCxWV}?!;%N`@rVVs#P#oG}5X_^j#NAlEu
z6j^ZMK8Q3;gXVRW6(|41;~k{K?cM7o=u;obXwvHYOc__d4uFfJZbED9i+$oFV4aLJ
zf!o{b063s1ir}Edd@;K6j=g`q3`J1{%W#wdQCnWq2GwyXfR=?QKykm-QU~Q3Tm2{i
z0jx?D)P8D{a~Ukb$z|B;o1n<z)x^k-+E~Oay1okfi8Ut0aRMIRU9d`~`+#w0OKuEc
zZQONMoSSqIJecXT7-^QlQUqA2<#{U>z2~s{Ljoo!qVIl}GxO>ch*^X<Y@U(rSO8jU
zilRX8^oa?z^p-yg%+6c0oBKZcy{0xbn&(r-qyr;H&e0?10aMmk<A|id8cR)0zWj`w
z5BK_%6caZ)pI3srr>q%wUcw*%{na9F{O`w=KNmiW0(NOv-vA{WYEe^_x?`d3fA^Gu
z1Ysgb6rw6mOsNB)cc*UVw($66!@AB%P$V}C*!dig$P?Su=D<K7c$Tk-lNepSkc92o
zuhq6o${YWDem)pay&vCR7p(?O%kERM`;^VY6GGKt3CzxPiFd5=IS*LhuEXBYB;Q@`
z8Cj|YqSS+%)4O)N<i?-f%r-wHm`Vp5O+1TX*E^KlCgkgwL}paY&8REe<_1-nP4`{y
z73PEQC;qB%{Ty&VyacAn1-Av%k*n?NPI+~kkbe*)GQ(~y%s}oB18j2`ktpomBAdx%
il3}V1`Fep^YkmPreo5vIjgo@^0000<MNUMnLSTYS<*$hV

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index 83e6f6e..dcfb58d 100755
--- a/main.c
+++ b/main.c
@@ -95,7 +95,7 @@ void SFG_init();
 #define RCL_TEXTURE_VERTICAL_STRETCH 0
 
 #define RCL_CAMERA_COLL_HEIGHT_BELOW 800
-#define RCL_CAMERA_COLL_HEIGHT_ABOVE 100
+#define RCL_CAMERA_COLL_HEIGHT_ABOVE 150
 
 #include "raycastlib.h" 
 
@@ -216,9 +216,9 @@ struct
                                   for determining whether player is in the
                                   air. */
   uint16_t headBobFrame;
+  uint8_t weapon;                 //< currently selected weapon
 } SFG_player;
 
-
 #if SFG_RESOLUTION_SCALEDOWN == 1
   #define SFG_setGamePixel SFG_setPixel
 #else
@@ -274,6 +274,8 @@ void SFG_initPlayer()
   SFG_player.previousVerticalSpeed = 0;
 
   SFG_player.headBobFrame = 0;
+
+  SFG_player.weapon = 0;
 }
 
 RCL_RayConstraints SFG_rayConstraints;
@@ -863,6 +865,12 @@ void SFG_init()
   SFG_lastFrameTimeMs = SFG_getTimeMs();
 }
 
+void SFG_playerRotateWeapon(uint8_t next)
+{
+  SFG_player.weapon = (SFG_player.weapon + (next * 2 - 1));
+  SFG_player.weapon %= 2;
+}
+
 /**
   Performs one game step (logic, physics), happening SFG_MS_PER_FRAME after
   previous frame. 
@@ -903,22 +911,42 @@ void SFG_gameStep()
       shearing = 1;
     }
 
-    if (SFG_keyPressed(SFG_KEY_LEFT))
-      strafe = -1;
-    else if (SFG_keyPressed(SFG_KEY_RIGHT))
-      strafe = 1;
+    if (!SFG_keyPressed(SFG_KEY_C))
+    {
+      if (SFG_keyPressed(SFG_KEY_LEFT))
+        strafe = -1;
+      else if (SFG_keyPressed(SFG_KEY_RIGHT))
+        strafe = 1;
+    }
+    else
+    {
+      if (SFG_keyPressed(SFG_KEY_LEFT))
+        SFG_playerRotateWeapon(0);
+      else if (SFG_keyPressed(SFG_KEY_RIGHT))
+        SFG_playerRotateWeapon(1);
+    }
   }
   else
   {
-    if (SFG_keyPressed(SFG_KEY_LEFT))
+    if (!SFG_keyPressed(SFG_KEY_C))
     {
-      SFG_player.camera.direction -= SFG_PLAYER_TURN_UNITS_PER_FRAME;
-      recomputeDirection = 1;
+      if (SFG_keyPressed(SFG_KEY_LEFT))
+      {
+        SFG_player.camera.direction -= SFG_PLAYER_TURN_UNITS_PER_FRAME;
+        recomputeDirection = 1;
+      }
+      else if (SFG_keyPressed(SFG_KEY_RIGHT))
+      {
+        SFG_player.camera.direction += SFG_PLAYER_TURN_UNITS_PER_FRAME;
+        recomputeDirection = 1;
+      }
     }
-    else if (SFG_keyPressed(SFG_KEY_RIGHT))
+    else
     {
-      SFG_player.camera.direction += SFG_PLAYER_TURN_UNITS_PER_FRAME;
-      recomputeDirection = 1;
+      if (SFG_keyPressed(SFG_KEY_LEFT))
+        SFG_playerRotateWeapon(0);
+      else if (SFG_keyPressed(SFG_KEY_RIGHT))
+        SFG_playerRotateWeapon(1);
     }
 
     if (recomputeDirection)
@@ -1375,7 +1403,7 @@ SFG_drawText("ammo",
 SFG_GAME_RESOLUTION_X - 10 - 4 * (SFG_FONT_CHARACTER_SIZE * SFG_FONT_SIZE_MEDIUM + 1)
 ,SFG_GAME_RESOLUTION_Y - 10 - SFG_FONT_CHARACTER_SIZE * SFG_FONT_SIZE_MEDIUM,SFG_FONT_SIZE_MEDIUM,7);
 
-SFG_blitImage(SFG_weaponImages[0],
+SFG_blitImage(SFG_weaponImages[SFG_player.weapon],
 SFG_WEAPON_IMAGE_POSITION_X,
 SFG_WEAPON_IMAGE_POSITION_Y + weaponBobOffset,
 SFG_WEAPON_IMAGE_SCALE);