zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fake multi: don't display name when aiming at opponents.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2936 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-19 13:02:43 +00:00
parent dc3a523eed
commit 1f858e8fc7
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
polymer/eduke32/source/game.c
View file

@ -2664,9 +2664,9 @@ void G_DisplayRest(int32_t smoothratio)
{ {
if (pp->newowner == -1 && !ud.pause_on) if (pp->newowner == -1 && !ud.pause_on)
{ {
cposx = pp->opos.x+mulscale16((int32_t)(pp->pos.x-pp->opos.x),smoothratio); cposx = pp->opos.x + mulscale16(pp->pos.x-pp->opos.x, smoothratio);
cposy = pp->opos.y+mulscale16((int32_t)(pp->pos.y-pp->opos.y),smoothratio); cposy = pp->opos.y + mulscale16(pp->pos.y-pp->opos.y, smoothratio);
cang = pp->oang+mulscale16((int32_t)(((pp->ang+1024-pp->oang)&2047)-1024),smoothratio); cang = pp->oang + mulscale16(((pp->ang+1024-pp->oang)&2047)-1024, smoothratio);
} }
else else
{ {
@ -3542,7 +3542,7 @@ void G_DrawRooms(int32_t snum, int32_t smoothratio)
if (p->over_shoulder_on) if (p->over_shoulder_on)
{ {
ud.camera.z -= 3072; ud.camera.z -= 3072;
G_DoThirdPerson(p,(vec3_t *)&ud.camera,&ud.camerasect,ud.cameraang,ud.camerahoriz); G_DoThirdPerson(p,&ud.camera,&ud.camerasect,ud.cameraang,ud.camerahoriz);
} }
cz = actor[p->i].ceilingz; cz = actor[p->i].ceilingz;
@ -9618,6 +9618,7 @@ void G_UpdatePlayerFromMenu(void)
{ {
/*int32_t j = g_player[myconnectindex].ps->team;*/ /*int32_t j = g_player[myconnectindex].ps->team;*/
// CODEDUP_UD_TO_GPLAYER
g_player[myconnectindex].ps->aim_mode = ud.mouseaiming; g_player[myconnectindex].ps->aim_mode = ud.mouseaiming;
g_player[myconnectindex].ps->auto_aim = ud.config.AutoAim; g_player[myconnectindex].ps->auto_aim = ud.config.AutoAim;
g_player[myconnectindex].ps->weaponswitch = ud.weaponswitch; g_player[myconnectindex].ps->weaponswitch = ud.weaponswitch;
@ -10429,6 +10430,7 @@ MAIN_LOOP_RESTART:
// ud.auto_run = ud.config.RunMode; // ud.auto_run = ud.config.RunMode;
ud.showweapons = ud.config.ShowOpponentWeapons; ud.showweapons = ud.config.ShowOpponentWeapons;
// CODEDUP_UD_TO_GPLAYER
g_player[myconnectindex].ps->aim_mode = ud.mouseaiming; g_player[myconnectindex].ps->aim_mode = ud.mouseaiming;
g_player[myconnectindex].ps->auto_aim = ud.config.AutoAim; g_player[myconnectindex].ps->auto_aim = ud.config.AutoAim;
g_player[myconnectindex].ps->weaponswitch = ud.weaponswitch; g_player[myconnectindex].ps->weaponswitch = ud.weaponswitch;
@ -10645,7 +10647,8 @@ int32_t G_DoMoveThings(void)
if (!user_quote_time[i]) pub = NUMPAGES; if (!user_quote_time[i]) pub = NUMPAGES;
} }
if (ud.idplayers && (g_netServer || ud.multimode > 1)) // Name display when aiming at opponents
if (ud.idplayers && (g_netServer || ud.multimode > 1) && !g_fakeMultiMode)
{ {
hitdata_t hit; hitdata_t hit;
DukePlayer_t *const p = g_player[screenpeek].ps; DukePlayer_t *const p = g_player[screenpeek].ps;