From: binarymaster Date: Mon, 6 Mar 2017 00:03:46 +0000 (+0300) Subject: Player model: Add new die level 5 for corpse slop X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=1f680d4a7f8c68a3f205d09b7a83e9f11c8498c6;p=d2df-sdl.git Player model: Add new die level 5 for corpse slop --- diff --git a/src/game/g_player.pas b/src/game/g_player.pas index c63aad4..a99e5b0 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -5668,8 +5668,9 @@ begin g_Player_CreateGibs(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2), FObj.Y+FObj.Rect.Y+(FObj.Rect.Height div 2), FModelName, FColor); + // Çâóê ìÿñà îò òðóïà: pm := g_PlayerModel_Get(FModelName); - pm.PlaySound(MODELSOUND_DIE, 3, FObj.X, FObj.Y); + pm.PlaySound(MODELSOUND_DIE, 5, FObj.X, FObj.Y); pm.Free; end; end diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas index 9b67c00..b5978c9 100644 --- a/src/game/g_playermodel.pas +++ b/src/game/g_playermodel.pas @@ -798,7 +798,7 @@ begin end else begin - if (Level in [2, 3]) and (FSlopSound > 0) then + if (Level in [2, 3, 5]) and (FSlopSound > 0) then begin g_Sound_PlayExAt('SOUND_MONSTER_SLOP', X, Y); if FSlopSound = 1 then @@ -815,6 +815,12 @@ begin SetLength(TempArray, Length(TempArray)+1); TempArray[High(TempArray)] := FDieSounds[a].ID; end; + if (TempArray = nil) and (Level = 5) then + begin + g_Sound_PlayExAt('SOUND_MONSTER_SLOP', X, Y); + Result := True; + Exit; + end; end; if TempArray = nil then Exit;