Subversion Repositories eduke32

Rev

Rev 879 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 879 Rev 881
Line 3469... Line 3469...
3469
    if (g_player[myconnectindex].ps->newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1)
3469
    if (g_player[myconnectindex].ps->newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1)
3470
    {
3470
    {
3471
        SetGameVarID(g_iReturnVarID,0,g_player[screenpeek].ps->i,screenpeek);
3471
        SetGameVarID(g_iReturnVarID,0,g_player[screenpeek].ps->i,screenpeek);
3472
        OnEvent(EVENT_DISPLAYCROSSHAIR, g_player[screenpeek].ps->i, screenpeek, -1);
3472
        OnEvent(EVENT_DISPLAYCROSSHAIR, g_player[screenpeek].ps->i, screenpeek, -1);
3473
        if (GetGameVarID(g_iReturnVarID,g_player[screenpeek].ps->i,screenpeek) == 0)
3473
        if (GetGameVarID(g_iReturnVarID,g_player[screenpeek].ps->i,screenpeek) == 0)
3474
            rotatesprite((160L-(g_player[myconnectindex].ps->look_ang>>1))<<16,100L<<16,ud.crosshair>1?65536L>>(ud.crosshair-1):65536L,0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
3474
            rotatesprite((160L-(g_player[myconnectindex].ps->look_ang>>1))<<16,100L<<16,scale(65536,ud.crosshairscale,100),0,CROSSHAIR,0,0,2+1,windowx1,windowy1,windowx2,windowy2);
3475
    }
3475
    }
3476
#if 0
3476
#if 0
3477
    if (gametype_flags[ud.coop] & GAMETYPE_FLAG_TDM)
3477
    if (gametype_flags[ud.coop] & GAMETYPE_FLAG_TDM)
3478
    {
3478
    {
3479
        for (i=0;i<ud.multimode;i++)
3479
        for (i=0;i<ud.multimode;i++)
Line 7821... Line 7821...
7821
    }
7821
    }
7822
7822
7823
    if (BUTTON(gamefunc_Toggle_Crosshair))
7823
    if (BUTTON(gamefunc_Toggle_Crosshair))
7824
    {
7824
    {
7825
        CONTROL_ClearButton(gamefunc_Toggle_Crosshair);
7825
        CONTROL_ClearButton(gamefunc_Toggle_Crosshair);
7826
        ud.crosshair = (ud.crosshair==3)?0:ud.crosshair+1;
7826
        ud.crosshair = !ud.crosshair;
7827
        if (ud.crosshair)
7827
        if (ud.crosshair)
7828
        {
7828
        {
7829
            int size[] = { 100, 50, 25 };
-
 
7830
            Bsprintf(fta_quotes[122],"%s [%d%%]",fta_quotes[20],size[ud.crosshair-1]);
7829
//            Bsprintf(fta_quotes[122],"%s [%d%%]",fta_quotes[20],size[ud.crosshair-1]);
7831
            FTA(122,g_player[screenpeek].ps);
7830
//            FTA(122,g_player[screenpeek].ps);
-
 
7831
            FTA(20,g_player[screenpeek].ps);
7832
        }
7832
        }
7833
        else FTA(21,g_player[screenpeek].ps);
7833
        else FTA(21,g_player[screenpeek].ps);
7834
    }
7834
    }
7835
7835
7836
    if (ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode))
7836
    if (ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode))