little changes

include/AceOfSpades/protocol.h

@@ -163,11 +163,9 @@ enum Extension {
 };
 
 enum HitEffectTarget {
-    HITEFFECT_GROUND = 0,
-    HITEFFECT_HEAD   = 1,
-    HITEFFECT_TORSO  = 2,
-    HITEFFECT_ARMS   = 3,
-    HITEFFECT_LEGS   = 4,
+    HITEFFECT_BLOCK    = 0,
+    HITEFFECT_HEADSHOT = 1,
+    HITEFFECT_PLAYER   = 2,
 };
 
 #define begin(T) typedef struct _##T T; struct _##T {

src/network.c

@@ -1076,13 +1076,15 @@ void getPacketHitEffect(uint8_t * data, int len) {
     Vector3f r = ntohv3f(p.pos);
     Vector3i b = ntohv3i(p.block);
 
-    if (p.target != HITEFFECT_GROUND) {
-        WAV * wav = sound(p.target == HITEFFECT_HEAD ? SOUND_SPADE_WHACK : SOUND_HITPLAYER);
+    if (p.target != HITEFFECT_BLOCK) {
+        WAV * wav = sound(p.target == HITEFFECT_HEADSHOT ? SOUND_SPADE_WHACK : SOUND_HITPLAYER);
         sound_create(SOUND_WORLD, wav, r.x, r.y, r.z);
     } else if (b.y > 0) map_damage(b.x, b.y, b.z, 15);
 
-    TrueColor color = p.target == HITEFFECT_GROUND ? map_get(b.x, b.y, b.z) : Red;
-    particle_create(color, r.x, r.y, r.z, 2.5F, 1.0F, 8, 0.1F, 0.25F);
+    if (p.target == HITEFFECT_BLOCK)
+        particle_create(map_get(b.x, b.y, b.z), r.x, r.y, r.z, 2.5F, 1.0F, 4, 0.1F, 0.25F);
+    else
+        particle_create(Red, r.x, r.y, r.z, 3.5F, 1.0F, 8, 0.1F, 0.4F);
 }
 
 void network_updateColor() {

src/weapon.c

@@ -41,8 +41,8 @@ void weapon_update() {
     if (weapon_reload_inprogress) {
         if (players[local_player.id].weapon == WEAPON_SHOTGUN) {
             if (window_time() - weapon_reload_start >= 0.5F) {
-
                 WAV * wav = NULL;
+
                 if (local_player.ammo < 6 && local_player.ammo_reserved > 0) {
                     local_player.ammo++;
                     local_player.ammo_reserved--;