From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 30 Sep 2018 13:23:59 +0000 (+0300)
Subject: Added new blood types for player's models
X-Git-Url: https://deadsoftware.ru/gitweb?a=commitdiff_plain;h=d8cb72ed4297af2d519c52270f8f32ddfd7fc58b;hp=7c0186b3f1e66e80377d14364f0cec949e44e615;p=d2df-sdl.git

Added new blood types for player's models
---

diff --git a/src/game/g_gfx.pas b/src/game/g_gfx.pas
index 4e9cdd8..e4c46f1 100644
--- a/src/game/g_gfx.pas
+++ b/src/game/g_gfx.pas
@@ -26,6 +26,8 @@ uses
 const
   BLOOD_NORMAL = 0;
   BLOOD_SPARKS = 1;
+  BLOOD_CSPARKS = 2;
+  BLOOD_COMBINE = 3;
 
   ONCEANIM_NONE  = 0;
   ONCEANIM_SMOKE = 1;
@@ -921,6 +923,11 @@ begin
   begin
     g_GFX_SparkVel(fX, fY, 2+Random(2), -vx div 2, -vy div 2, devX, devY);
     exit;
+  end
+  else if (kind = BLOOD_CSPARKS) OR (kind = BLOOD_COMBINE) then
+  begin
+    g_GFX_SparkVel(fX, fY, count, -vx div 2, -vy div 2, devX, devY);
+    if kind <> BLOOD_COMBINE then exit
   end;
 
   l := Length(Particles);
diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index acc89b2..e2148e8 100644
--- a/src/game/g_playermodel.pas
+++ b/src/game/g_playermodel.pas
@@ -447,7 +447,8 @@ begin
     Blood.B := MAX(0, MIN(255, config.ReadInt('Blood', 'B', 0)));
     case config.ReadStr('Blood', 'Kind', 'NORMAL') of
       'NORMAL': Blood.Kind := BLOOD_NORMAL;
-      'SPARKS': Blood.Kind := BLOOD_SPARKS;
+      'SPARKS': Blood.Kind := BLOOD_CSPARKS;
+      'COMBINE': Blood.Kind := BLOOD_COMBINE;
     else
       Blood.Kind := BLOOD_NORMAL
     end