X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_playermodel.pas;h=6ffea1fbc3fc094fb714fb25df4ef20623235c4a;hb=f9d99d6e5b67984253827ecf73be6f34a67d1a7c;hp=acc89b26571f32665b37684b9ba4042999e8e938;hpb=76e01bd65fd627b1e2333f8a48ea3de573a4a994;p=d2df-sdl.git

diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index acc89b2..6ffea1f 100644
--- a/src/game/g_playermodel.pas
+++ b/src/game/g_playermodel.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -398,7 +397,7 @@ var
   prefix: string;
   ok, chk: Boolean;
 begin
-  e_WriteLog(Format('Loading player model: %s', [ExtractFileName(FileName)]), TMsgType.Notify);
+  e_WriteLog(Format('Loading player model "%s"...', [FileName]), TMsgType.Notify);
 
   Result := False;
 
@@ -447,7 +446,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