Subversion Repositories eduke32

Rev

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

Rev 8778 Rev 8789
Line 32... Line 32...
32
#include "input.h"
32
#include "input.h"
33
#include "osdcmds.h"
33
#include "osdcmds.h"
34
#include "savegame.h"
34
#include "savegame.h"
35
#include "xxhash.h"
35
#include "xxhash.h"
36
#include "music.h"
36
#include "music.h"
-
 
37
#include "sbar.h"
37
38
38
#ifndef __ANDROID__
39
#ifndef __ANDROID__
39
droidinput_t droidinput;
40
droidinput_t droidinput;
40
#endif
41
#endif
41
42
Line 2437... Line 2438...
2437
        mgametextcenter(origin.x, origin.y + (144<<16), "Activate in-game with Shift-F#");
2438
        mgametextcenter(origin.x, origin.y + (144<<16), "Activate in-game with Shift-F#");
2438
        break;
2439
        break;
2439
2440
2440
    case MENU_COLCORR:
2441
    case MENU_COLCORR:
2441
    case MENU_COLCORR_INGAME:
2442
    case MENU_COLCORR_INGAME:
-
 
2443
    {
2442
        // center panel
2444
        // center panel
2443
        rotatesprite_fs(origin.x + (120<<16), origin.y + (32<<16), 16384, 0, 3290, 0, 0, 2|8|16);
2445
        rotatesprite_fs(origin.x + (120<<16), origin.y + (32<<16), 16384, 0, 3290, 0, 0, 2|8|16);
-
 
2446
        int32_t const statusTile = sbartile();
2444
        rotatesprite_fs(origin.x + (160<<16) - (tilesiz[BOTTOMSTATUSBAR].x<<13), origin.y + (82<<16) - (tilesiz[BOTTOMSTATUSBAR].y<<14), 16384, 0, BOTTOMSTATUSBAR, 0, 0, 2|8|16);
2447
        rotatesprite_fs(origin.x + (160<<16) - (tilesiz[statusTile].x<<13), origin.y + (82<<16) - (tilesiz[statusTile].y<<14), 16384, 0, statusTile, 0, 0, 2|8|16);
2445
2448
2446
        // left panel
2449
        // left panel
2447
        rotatesprite_fs(origin.x + (40<<16), origin.y + (32<<16), 16384, 0, BONUSSCREEN, 0, 0, 2|8|16);
2450
        rotatesprite_fs(origin.x + (40<<16), origin.y + (32<<16), 16384, 0, BONUSSCREEN, 0, 0, 2|8|16);
2448
2451
2449
        // right panel
2452
        // right panel
2450
        rotatesprite_fs(origin.x + (200<<16), origin.y + (32<<16), 16384, 0, LOADSCREEN, 0, 0, 2|8|16);
2453
        rotatesprite_fs(origin.x + (200<<16), origin.y + (32<<16), 16384, 0, LOADSCREEN, 0, 0, 2|8|16);
2451
        break;
2454
        break;
-
 
2455
    }
2452
2456
2453
    case MENU_NETSETUP:
2457
    case MENU_NETSETUP:
2454
    case MENU_NETHOST:
2458
    case MENU_NETHOST:
2455
        mminitext(origin.x + (90<<16), origin.y + (90<<16), "Game Type", MF_Minifont.pal_deselected);
2459
        mminitext(origin.x + (90<<16), origin.y + (90<<16), "Game Type", MF_Minifont.pal_deselected);
2456
        mminitext(origin.x + (90<<16), origin.y + ((90+8)<<16), "Episode", MF_Minifont.pal_deselected);
2460
        mminitext(origin.x + (90<<16), origin.y + ((90+8)<<16), "Episode", MF_Minifont.pal_deselected);