From 36079bed49f66bb2d58abcc201357844041da57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Thu, 24 Oct 2019 02:03:57 +0200
Subject: [PATCH] Add machine gun

---
 assets.h                     |  21 ++++++++++++++++++++-
 assets/weapon_machinegun.png | Bin 0 -> 496 bytes
 main.c                       |   9 ++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 assets/weapon_machinegun.png

diff --git a/assets.h b/assets.h
index 1a5530c..3c6660d 100644
--- a/assets.h
+++ b/assets.h
@@ -434,7 +434,26 @@ SFG_PROGRAM_MEMORY uint8_t SFG_weaponImages[][SFG_TEXTURE_STORE_SIZE] =
 235,85,0,0,0,0,0,0,0,0,0,0,0,0,17,17,122,153,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
   },
-  { // 2, rocket launcher
+  { // 2, machine gun
+175,4,3,0,2,1,6,5,60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3,51,51,48,0,0,0,0,0,0,0,0,0,0,0,51,54,102,18,67,0,0,0,0,0,0,0,0,0,
+3,51,100,70,97,34,69,0,0,0,0,0,0,0,0,51,54,68,102,102,18,34,69,0,0,0,0,0,0,3,51,
+100,70,102,102,97,34,34,69,0,0,0,0,0,0,54,102,102,119,113,17,18,34,36,69,0,0,0,
+0,0,3,113,17,17,17,17,17,18,34,36,69,0,0,0,0,51,52,17,17,17,18,34,34,34,36,85,
+85,0,0,3,51,120,116,17,34,34,33,17,17,17,34,23,119,0,3,54,134,134,100,18,17,17,
+17,17,17,17,34,17,23,0,3,72,40,40,132,18,17,17,17,17,17,17,34,17,17,0,3,50,66,
+66,36,18,17,17,17,17,17,17,34,17,17,0,0,3,51,69,68,17,119,119,113,17,17,17,34,
+17,17,0,0,0,0,51,52,17,17,17,23,119,119,114,36,85,85,0,0,0,0,0,3,33,17,17,17,17,
+17,18,34,37,85,0,0,0,0,0,0,52,68,68,34,33,17,18,34,36,69,0,0,0,0,0,0,3,51,69,84,
+68,68,66,34,34,69,0,0,0,0,0,0,0,0,51,52,85,68,68,34,34,69,0,0,0,0,0,0,0,0,0,3,
+51,69,84,66,34,69,0,0,0,0,0,0,0,0,0,0,0,51,52,68,34,67,0,0,0,0,0,0,0,0,0,0,0,0,
+3,51,51,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0
+  },
+  { // 3, rocket launcher
 175,2,0,115,7,117,116,6,37,114,5,38,39,1,25,33,0,0,0,0,0,0,0,0,0,0,0,0,0,2,34,
 32,0,0,0,0,0,0,0,0,0,0,0,2,34,42,129,18,0,0,0,0,0,0,0,0,0,0,0,39,119,168,26,18,
 0,0,0,0,0,0,0,0,0,0,0,40,136,136,26,18,0,0,0,0,0,0,0,0,0,0,0,33,17,17,17,210,0,
diff --git a/assets/weapon_machinegun.png b/assets/weapon_machinegun.png
new file mode 100644
index 0000000000000000000000000000000000000000..5558f417895ffa2e4e774a6a5be5a11d774bf44c
GIT binary patch
literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhX2XskIMF-;w7Z*DW_ZOn=0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbOYDq*vR9M5+Rv~i3Fc92m3<L}M009F%pukVi6Y_+B0zajo
zpid|aD7YsC<N*Q#dO$&-S&N*pTr1Kkjy3g+XKc^t?zFqw^=<%uQ1KF|d{rNyxo5GQ
zJP)-HFvirOKmxGVLUnr_UJn5pn<4P_c>=yq@Xpr}VZZNy=MJh>#Wi*%J|F=czmA~u
zB|w0P*kUY3fX<fy0qg9x6quK%;9a+R8wzCN=y7RiO1QtJdeth(_mAu$1ozxen_FkE
z_mm1_Otvo+Td{RE;9a$<$PfNU8jkRDGeWM3K;QRlidLr}w<yP&8xH*A0CNEXfOkF+
zqHZ;Gt05D<ARYlf2Qd}}xyOuS%gx&ApAV9vK|BinTpFqyQ8W$b@DtG=&rj`ks+m|y
zW@W*=d9K29@<Eg|j}=||o-(C|+kD*p(oYEyEjGM0gy1OHJAd6}tSAw&V!2tvc<xyn
m9bf<;Bao&<wuD^Fh<*W88N*N4@l|O60000<MNUMnLSTX^E620|

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index 1560bea..c64f51f 100755
--- a/main.c
+++ b/main.c
@@ -109,7 +109,10 @@ void SFG_init();
 
 #define SFG_WEAPON_KNIFE 0
 #define SFG_WEAPON_SHOTGUN 1
-#define SFG_WEAPON_ROCKER_LAUNCHER 2
+#define SFG_WEAPON_MACHINE_GUN 2
+#define SFG_WEAPON_ROCKER_LAUNCHER 3
+
+#define SFG_WEAPONS_TOTAL 4
 
 #define SFG_GAME_RESOLUTION_X \
   (SFG_SCREEN_RESOLUTION_X / SFG_RESOLUTION_SCALEDOWN)
@@ -1097,8 +1100,8 @@ void SFG_init()
 
 void SFG_playerRotateWeapon(uint8_t next)
 {
-  SFG_player.weapon = (SFG_player.weapon + (next * 2 - 1));
-  SFG_player.weapon %= 3;
+  SFG_player.weapon += next ? 1 : -1;
+  SFG_player.weapon %= SFG_WEAPONS_TOTAL;
 }
 
 /**