diff --git a/src/client/sentences.c b/src/client/sentences.c index 4435058d..4b3ce821 100644 --- a/src/client/sentences.c +++ b/src/client/sentences.c @@ -147,6 +147,8 @@ Sentences_Init(void) } } } + + fclose(fs_sentences); } string diff --git a/src/gs-entbase/server/func_brush.cpp b/src/gs-entbase/server/func_brush.cpp index 74aab61b..e91794ae 100644 --- a/src/gs-entbase/server/func_brush.cpp +++ b/src/gs-entbase/server/func_brush.cpp @@ -65,9 +65,9 @@ func_brush::Trigger(entity act, int state) } /* toggle appareance */ - if (Solidity == 0) { + if (m_iSolidity == 0) { if (solid == SOLID_NOT) - SetModelIndex(0); + SetModelindex(0); else SetModel(m_oldModel); } @@ -110,7 +110,7 @@ func_brush::Respawn(void) default: if (m_iStartOff) { SetSolid(SOLID_NOT); - SetModelIndex(0); + SetModelindex(0); } else { SetSolid(SOLID_BSP); } diff --git a/src/plugins/voxannouncer.c b/src/plugins/voxannouncer.c index 74e41181..85448425 100644 --- a/src/plugins/voxannouncer.c +++ b/src/plugins/voxannouncer.c @@ -29,7 +29,7 @@ FMX_PlayerObituary(entity attk, entity targ, int weapon, int body, int dmg) { /* silly announcer */ if (attk != world && attk != targ) { - int r = floor(random(0,18)); + int r = floor(random(0,20)); switch (r) { case 0: @@ -45,7 +45,7 @@ FMX_PlayerObituary(entity attk, entity targ, int weapon, int body, int dmg) VoxFunc("buzwarn terminated"); break; case 4: - VoxFunc("buzwarn to slow amigo"); + VoxFunc("buzwarn to slow pal"); break; case 5: VoxFunc("buzwarn that is hot"); @@ -69,10 +69,10 @@ FMX_PlayerObituary(entity attk, entity targ, int weapon, int body, int dmg) VoxFunc("buzwarn kill life"); break; case 12: - VoxFunc("buzwarn kill that amigo"); + VoxFunc("buzwarn kill that pal"); break; case 13: - VoxFunc("buzwarn explode that amigo"); + VoxFunc("buzwarn explode that pal"); break; case 14: VoxFunc("buzwarn life denied"); @@ -83,6 +83,12 @@ FMX_PlayerObituary(entity attk, entity targ, int weapon, int body, int dmg) case 16: VoxFunc("buzwarn target destroyed"); break; + case 17: + VoxFunc("buzwarn adios mister"); + break; + case 18: + VoxFunc("buzwarn expect an oscar for that kill"); + break; default: VoxFunc("buzwarn exterminate exterminate"); break;