X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_playermodel.pas;h=612644fce1527f96799429ada9fa976fe0dba7d8;hb=6c6b87eea9373ec4f1cb859223d3708d8e2a59c6;hp=acc89b26571f32665b37684b9ba4042999e8e938;hpb=76e01bd65fd627b1e2333f8a48ea3de573a4a994;p=d2df-sdl.git diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas index acc89b2..612644f 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 @@ -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