diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index fec21e4be187f1ca06641aa67e0916dd5c9f5197..1fdf62b2ab96e5d7cc16ce0880d91f1078732f43 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
procedure g_Game_ChatSound(Text: String; Taunt: Boolean = True);
procedure g_Game_Announce_GoodShot(SpawnerUID: Word);
procedure g_Game_Announce_KillCombo(Param: Integer);
+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
procedure g_Game_StartVote(Command, Initiator: string);
procedure g_Game_CheckVote;
procedure g_TakeScreenShot();
DE_GLOBEVENT = 0;
DE_BFGHIT = 1;
DE_KILLCOMBO = 2;
+ DE_BODYKILL = 3;
ANNOUNCE_NONE = 0;
ANNOUNCE_ME = 1;
gAnnouncer: Byte = ANNOUNCE_NONE;
goodsnd: array[0..3] of TPlayableSound;
killsnd: array[0..3] of TPlayableSound;
+ hahasnd: array[0..2] of TPlayableSound;
+ gBodyKillEvent: Integer = -1;
gDefInterTime: ShortInt = -1;
gInterEndTime: LongWord = 0;
gInterTime: LongWord = 0;
if g_Game_IsNet and g_Game_IsServer then
MH_SEND_GameEvent(NET_EV_KILLCOMBO, gDelayedEvents[a].DENum);
end;
+ DE_BODYKILL:
+ if gGameOn then
+ g_Game_Announce_BodyKill(gDelayedEvents[a].DENum);
end;
gDelayedEvents[a].Pending := False;
end;
g_Texture_CreateWADEx('TEXTURE_PLAYER_BLUEFLAG_D', GameWAD+':TEXTURES\FLAGHUD_B_DROP');
g_Texture_CreateWADEx('TEXTURE_PLAYER_TALKBUBBLE', GameWAD+':TEXTURES\TALKBUBBLE');
g_Texture_CreateWADEx('TEXTURE_PLAYER_INVULPENTA', GameWAD+':TEXTURES\PENTA');
+ g_Texture_CreateWADEx('TEXTURE_PLAYER_INDICATOR', GameWAD+':TEXTURES\PLRIND');
hasPBarGfx := true;
if not g_Texture_CreateWADEx('UI_GFX_PBAR_LEFT', GameWAD+':TEXTURES\LLEFT') then hasPBarGfx := false;
end;
g_Frames_CreateWAD(nil, 'FRAMES_TELEPORT', GameWAD+':TEXTURES\TELEPORT', 64, 64, 10, False);
- g_Frames_CreateWAD(nil, 'FRAMES_PUNCH', GameWAD+':TEXTURES\PUNCH', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH', GameWAD+':WEAPONS\PUNCH', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_UP', GameWAD+':WEAPONS\PUNCH_UP', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_DN', GameWAD+':WEAPONS\PUNCH_DN', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK', GameWAD+':WEAPONS\PUNCHB', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK_UP', GameWAD+':WEAPONS\PUNCHB_UP', 64, 64, 4, False);
+ g_Frames_CreateWAD(nil, 'FRAMES_PUNCH_BERSERK_DN', GameWAD+':WEAPONS\PUNCHB_DN', 64, 64, 4, False);
g_Sound_CreateWADEx('SOUND_GAME_TELEPORT', GameWAD+':SOUNDS\TELEPORT');
g_Sound_CreateWADEx('SOUND_GAME_NOTELEPORT', GameWAD+':SOUNDS\NOTELEPORT');
g_Sound_CreateWADEx('SOUND_GAME_DOOROPEN', GameWAD+':SOUNDS\DOOROPEN');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL3X', GameWAD+':SOUNDS\KILL3X');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILL4X', GameWAD+':SOUNDS\KILL4X');
g_Sound_CreateWADEx('SOUND_ANNOUNCER_KILLMX', GameWAD+':SOUNDS\KILLMX');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA1', GameWAD+':SOUNDS\MUHAHA1');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA2', GameWAD+':SOUNDS\MUHAHA2');
+ g_Sound_CreateWADEx('SOUND_ANNOUNCER_MUHAHA3', GameWAD+':SOUNDS\MUHAHA3');
goodsnd[0] := TPlayableSound.Create();
goodsnd[1] := TPlayableSound.Create();
killsnd[2].SetByName('SOUND_ANNOUNCER_KILL4X');
killsnd[3].SetByName('SOUND_ANNOUNCER_KILLMX');
+ hahasnd[0] := TPlayableSound.Create();
+ hahasnd[1] := TPlayableSound.Create();
+ hahasnd[2] := TPlayableSound.Create();
+
+ hahasnd[0].SetByName('SOUND_ANNOUNCER_MUHAHA1');
+ hahasnd[1].SetByName('SOUND_ANNOUNCER_MUHAHA2');
+ hahasnd[2].SetByName('SOUND_ANNOUNCER_MUHAHA3');
+
g_Game_LoadChatSounds(GameWAD+':CHATSND\SNDCFG');
g_Game_SetLoadingText(_lc[I_LOAD_ITEMS_DATA], 0, False);
g_Texture_Delete('TEXTURE_PLAYER_INVULPENTA');
g_Frames_DeleteByName('FRAMES_TELEPORT');
g_Frames_DeleteByName('FRAMES_PUNCH');
+ g_Frames_DeleteByName('FRAMES_PUNCH_UP');
+ g_Frames_DeleteByName('FRAMES_PUNCH_DN');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK_UP');
+ g_Frames_DeleteByName('FRAMES_PUNCH_BERSERK_DN');
g_Sound_Delete('SOUND_GAME_TELEPORT');
g_Sound_Delete('SOUND_GAME_NOTELEPORT');
g_Sound_Delete('SOUND_GAME_DOOROPEN');
g_Sound_Delete('SOUND_ANNOUNCER_KILL4X');
g_Sound_Delete('SOUND_ANNOUNCER_KILLMX');
+ hahasnd[0].Free();
+ hahasnd[1].Free();
+ hahasnd[2].Free();
+
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA1');
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA2');
+ g_Sound_Delete('SOUND_ANNOUNCER_MUHAHA3');
+
g_Game_FreeChatSounds();
DataLoaded := False;
renderMapInternal(-c, -d, true);
+ if (gGameSettings.GameMode <> GM_SINGLE) and gPlayerIndicator then
+ p.DrawIndicator();
if p.FSpectator then
e_TextureFontPrintEx(p.GameX + PLAYER_RECT_CX - 4,
p.GameY + PLAYER_RECT_CY - 4,
killsnd[n].Play();
end;
+procedure g_Game_Announce_BodyKill(SpawnerUID: Word);
+var
+ a: Integer;
+begin
+ case gAnnouncer of
+ ANNOUNCE_NONE:
+ Exit;
+ ANNOUNCE_ME,
+ ANNOUNCE_MEPLUS:
+ if not g_Game_IsWatchedPlayer(SpawnerUID) then
+ Exit;
+ end;
+ for a := 0 to 2 do
+ if hahasnd[a].IsPlaying() then
+ Exit;
+
+ hahasnd[Random(3)].Play();
+end;
+
procedure g_Game_StartVote(Command, Initiator: string);
var
Need: Integer;