Subversion Repositories eduke32

Rev

Rev 4951 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4951 Rev 4966
Line 5508... Line 5508...
5508
    if (mousestatus && mousepressstate == Mouse_Pressed)
5508
    if (mousestatus && mousepressstate == Mouse_Pressed)
5509
        m_mousedownpos = m_mousepos;
5509
        m_mousedownpos = m_mousepos;
5510
5510
5511
    M_RunMenuInput(m_currentMenu);
5511
    M_RunMenuInput(m_currentMenu);
5512
5512
-
 
5513
    g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
-
 
5514
    g_player[myconnectindex].ps->fta = 0;
-
 
5515
-
 
5516
    if (((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && M_BlackTranslucentBackgroundOK(g_currentMenu))
-
 
5517
        fade_screen_black(1);
-
 
5518
-
 
5519
    if (M_UpdateScreenOK(g_currentMenu))
-
 
5520
        G_UpdateScreenArea();
-
 
5521
-
 
5522
#if !defined EDUKE32_TOUCH_DEVICES
-
 
5523
    if (m_menuchange_watchpoint > 0)
-
 
5524
        m_menuchange_watchpoint++;
-
 
5525
#endif
-
 
5526
5513
    // Determine animation values.
5527
    // Determine animation values.
5514
    if (totalclock < m_animation.start + m_animation.length)
5528
    if (totalclock < m_animation.start + m_animation.length)
5515
    {
5529
    {
5516
        const int32_t screenwidth = scale(240<<16, xdim, ydim);
5530
        const int32_t screenwidth = scale(240<<16, xdim, ydim);
5517
5531
Line 5525... Line 5539...
5525
5539
5526
    ud.m_origin = origin;
5540
    ud.m_origin = origin;
5527
    VM_OnEventWithReturn(EVENT_DISPLAYMENU, g_player[screenpeek].ps->i, screenpeek, g_currentMenu);
5541
    VM_OnEventWithReturn(EVENT_DISPLAYMENU, g_player[screenpeek].ps->i, screenpeek, g_currentMenu);
5528
    origin = ud.m_origin;
5542
    origin = ud.m_origin;
5529
5543
5530
    g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
-
 
5531
    g_player[myconnectindex].ps->fta = 0;
-
 
5532
-
 
5533
    if (((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && M_BlackTranslucentBackgroundOK(g_currentMenu))
-
 
5534
        fade_screen_black(1);
-
 
5535
-
 
5536
    if (M_UpdateScreenOK(g_currentMenu))
-
 
5537
        G_UpdateScreenArea();
-
 
5538
-
 
5539
#if !defined EDUKE32_TOUCH_DEVICES
-
 
5540
    if (m_menuchange_watchpoint > 0)
-
 
5541
        m_menuchange_watchpoint++;
-
 
5542
#endif
-
 
5543
-
 
5544
    // Display the menu, with a transition animation if applicable.
5544
    // Display the menu, with a transition animation if applicable.
5545
    if (totalclock < m_animation.start + m_animation.length)
5545
    if (totalclock < m_animation.start + m_animation.length)
5546
    {
5546
    {
5547
        M_RunMenu(m_animation.previous, previousOrigin);
5547
        M_RunMenu(m_animation.previous, previousOrigin);
5548
        M_RunMenu(m_animation.current, origin);
5548
        M_RunMenu(m_animation.current, origin);