reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-01 01:25:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #197 from WPMGPRoSToTeMa/fixhullcenter

Browse Source 
SV_HullForBsp: use hull center instead of corner
This commit is contained in:
theAsmodai 2016-04-16 20:33:33 +03:00
commit 1d4def69ea
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rehlds/engine/server.h
View File

@ -543,6 +543,7 @@ extern cvar_t sv_echo_unknown_cmd;
extern cvar_t sv_auto_precache_sounds_in_models; extern cvar_t sv_auto_precache_sounds_in_models;
extern cvar_t sv_delayed_spray_upload; extern cvar_t sv_delayed_spray_upload;
extern cvar_t sv_rehlds_force_dlmax; extern cvar_t sv_rehlds_force_dlmax;
extern cvar_t sv_rehlds_hull_centering;
#endif #endif
extern int sv_playermodel; extern int sv_playermodel;

2
rehlds/engine/sv_main.cpp
View File

@ -304,6 +304,7 @@ cvar_t sv_auto_precache_sounds_in_models = { "sv_auto_precache_sounds_in_models"
cvar_t sv_delayed_spray_upload = { "sv_delayed_spray_upload", "0", 0, 0.0f, nullptr }; cvar_t sv_delayed_spray_upload = { "sv_delayed_spray_upload", "0", 0, 0.0f, nullptr };
cvar_t sv_rehlds_force_dlmax = { "sv_rehlds_force_dlmax", "0", 0, 0.0f, nullptr }; cvar_t sv_rehlds_force_dlmax = { "sv_rehlds_force_dlmax", "0", 0, 0.0f, nullptr };
cvar_t listipcfgfile = { "listipcfgfile", "listip.cfg", 0, 0.0f, nullptr }; cvar_t listipcfgfile = { "listipcfgfile", "listip.cfg", 0, 0.0f, nullptr };
cvar_t sv_rehlds_hull_centering = { "sv_rehlds_hull_centering", "0", 0, 0.0f, nullptr };
#endif #endif
/* <a6492> ../engine/sv_main.c:113 */ /* <a6492> ../engine/sv_main.c:113 */
@ -7775,6 +7776,7 @@ void SV_Init(void)
Cvar_RegisterVariable(&sv_auto_precache_sounds_in_models); Cvar_RegisterVariable(&sv_auto_precache_sounds_in_models);
Cvar_RegisterVariable(&sv_delayed_spray_upload); Cvar_RegisterVariable(&sv_delayed_spray_upload);
Cvar_RegisterVariable(&sv_rehlds_force_dlmax); Cvar_RegisterVariable(&sv_rehlds_force_dlmax);
Cvar_RegisterVariable(&sv_rehlds_hull_centering);
#endif #endif
for (int i = 0; i < MAX_MODELS; i++) for (int i = 0; i < MAX_MODELS; i++)

15
rehlds/engine/world.cpp
View File

@ -190,8 +190,23 @@ struct hull_s *SV_HullForBsp(edict_t *ent, const vec_t *mins, const vec_t *maxs,
else else
hull = &model->hulls[3]; hull = &model->hulls[3];
} }
// TODO: add cvar for this?
#ifdef REHLDS_FIXES
if ( sv_rehlds_hull_centering.value
&& mins[0] + maxs[0] == 0.0f)
offset[0] = 0.0f;
else
offset[0] = hull->clip_mins[0] - mins[0];
if ( sv_rehlds_hull_centering.value
&& mins[1] + maxs[1] == 0.0f)
offset[1] = 0.0f;
else
offset[1] = hull->clip_mins[1] - mins[1];
#else // REHLDS_FIXES
offset[0] = hull->clip_mins[0] - mins[0]; offset[0] = hull->clip_mins[0] - mins[0];
offset[1] = hull->clip_mins[1] - mins[1]; offset[1] = hull->clip_mins[1] - mins[1];
#endif // REHLDS_FIXES
offset[2] = hull->clip_mins[2] - mins[2]; offset[2] = hull->clip_mins[2] - mins[2];
} }
else else