vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Fix client-side sentences filehandler from not being closed, other shenanigans.

Browse source
This commit is contained in:
Marco Cawthorne 2020-09-18 09:35:59 +02:00
parent 809966ab7b
commit 5131f19c04
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/sentences.c
View file

@ -147,6 +147,8 @@ Sentences_Init(void)
}
}
}
fclose(fs_sentences);
}
string

6
src/gs-entbase/server/func_brush.cpp
View file

@ -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);
}

14
src/plugins/voxannouncer.c
View file

@ -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;