mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@153 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
414d486de5
commit
9122c35836
2 changed files with 19 additions and 18 deletions
|
@ -530,7 +530,7 @@ void editinput(void)
|
||||||
if (mlook == 1)
|
if (mlook == 1)
|
||||||
{
|
{
|
||||||
ang += mousx;
|
ang += mousx;
|
||||||
horiz -= mousy>>1;
|
horiz -= (mousy>>1)-1;
|
||||||
if (horiz > 299)
|
if (horiz > 299)
|
||||||
horiz = 299;
|
horiz = 299;
|
||||||
if (horiz < -99)
|
if (horiz < -99)
|
||||||
|
|
|
@ -2994,28 +2994,29 @@ void displayrest(long smoothratio)
|
||||||
OnEvent(EVENT_DISPLAYCROSSHAIR, ps[screenpeek].i, screenpeek, -1);
|
OnEvent(EVENT_DISPLAYCROSSHAIR, ps[screenpeek].i, screenpeek, -1);
|
||||||
if(GetGameVarID(g_iReturnVarID,ps[screenpeek].i,screenpeek) == 0)
|
if(GetGameVarID(g_iReturnVarID,ps[screenpeek].i,screenpeek) == 0)
|
||||||
rotatesprite((160L-(ps[myconnectindex].look_ang>>1))<<16,100L<<16,ud.crosshair>1?65536L>>(ud.crosshair-1):65536L,0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
|
rotatesprite((160L-(ps[myconnectindex].look_ang>>1))<<16,100L<<16,ud.crosshair>1?65536L>>(ud.crosshair-1):65536L,0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
|
||||||
|
}
|
||||||
|
|
||||||
if(ud.idplayers)
|
if(ud.idplayers && ud.multimode > 1)
|
||||||
|
{
|
||||||
|
long sx,sy,sz;
|
||||||
|
short sect,hw,hs;
|
||||||
|
|
||||||
|
hitscan(ps[screenpeek].posx,ps[screenpeek].posy,ps[screenpeek].posz,ps[screenpeek].cursectnum,
|
||||||
|
sintable[(ps[screenpeek].ang+512)&2047],
|
||||||
|
sintable[ps[screenpeek].ang&2047],
|
||||||
|
(100-ps[screenpeek].horiz-ps[screenpeek].horizoff)<<11,§,&hw,&hs,&sx,&sy,&sz,CLIPMASK1);
|
||||||
|
|
||||||
|
if(sprite[hs].picnum == APLAYER && sprite[hs].yvel != screenpeek)
|
||||||
{
|
{
|
||||||
long sx,sy,sz;
|
if(ps[screenpeek].fta == 0 || ps[screenpeek].ftq == 117)
|
||||||
short sect,hw,hs;
|
|
||||||
|
|
||||||
hitscan(ps[screenpeek].posx,ps[screenpeek].posy,ps[screenpeek].posz,ps[screenpeek].cursectnum,
|
|
||||||
sintable[(ps[screenpeek].ang+512)&2047],
|
|
||||||
sintable[ps[screenpeek].ang&2047],
|
|
||||||
(100-ps[screenpeek].horiz-ps[screenpeek].horizoff)<<11,§,&hw,&hs,&sx,&sy,&sz,CLIPMASK1);
|
|
||||||
|
|
||||||
if(sprite[hs].picnum == APLAYER)
|
|
||||||
{
|
{
|
||||||
if(ps[screenpeek].fta == 0 || ps[screenpeek].ftq == 117)
|
Bsprintf(fta_quotes[117],"%s",&ud.user_name[sprite[hs].yvel][0]);
|
||||||
{
|
ps[screenpeek].fta = 12;
|
||||||
Bsprintf(fta_quotes[117],"%s",&ud.user_name[sprite[hs].yvel][0]);
|
ps[screenpeek].ftq = 117;
|
||||||
ps[screenpeek].fta = 12;
|
} else ps[screenpeek].fta--;
|
||||||
ps[screenpeek].ftq = 117;
|
|
||||||
} else ps[screenpeek].fta--;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(ps[myconnectindex].gm&MODE_TYPE)
|
if(ps[myconnectindex].gm&MODE_TYPE)
|
||||||
typemode();
|
typemode();
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue