diff options
Diffstat (limited to 'src/doom/m_menu.c')
-rw-r--r-- | src/doom/m_menu.c | 75 |
1 files changed, 41 insertions, 34 deletions
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c index 113edc43..a5e81775 100644 --- a/src/doom/m_menu.c +++ b/src/doom/m_menu.c @@ -540,7 +540,9 @@ void M_DrawLoad(void) { int i; - V_DrawPatchDirect (72,28,0,W_CacheLumpName(DEH_String("M_LOADG"),PU_CACHE)); + V_DrawPatchDirect(72, 28, + W_CacheLumpName(DEH_String("M_LOADG"), PU_CACHE)); + for (i = 0;i < load_end; i++) { M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i); @@ -557,15 +559,18 @@ void M_DrawSaveLoadBorder(int x,int y) { int i; - V_DrawPatchDirect (x-8,y+7,0,W_CacheLumpName(DEH_String("M_LSLEFT"),PU_CACHE)); + V_DrawPatchDirect(x - 8, y + 7, + W_CacheLumpName(DEH_String("M_LSLEFT"), PU_CACHE)); for (i = 0;i < 24;i++) { - V_DrawPatchDirect (x,y+7,0,W_CacheLumpName(DEH_String("M_LSCNTR"),PU_CACHE)); + V_DrawPatchDirect(x, y + 7, + W_CacheLumpName(DEH_String("M_LSCNTR"), PU_CACHE)); x += 8; } - V_DrawPatchDirect (x,y+7,0,W_CacheLumpName(DEH_String("M_LSRGHT"),PU_CACHE)); + V_DrawPatchDirect(x, y + 7, + W_CacheLumpName(DEH_String("M_LSRGHT"), PU_CACHE)); } @@ -606,7 +611,7 @@ void M_DrawSave(void) { int i; - V_DrawPatchDirect (72,28,0,W_CacheLumpName(DEH_String("M_SAVEG"),PU_CACHE)); + V_DrawPatchDirect(72, 28, W_CacheLumpName(DEH_String("M_SAVEG"), PU_CACHE)); for (i = 0;i < load_end; i++) { M_DrawSaveLoadBorder(LoadDef.x,LoadDef.y+LINEHEIGHT*i); @@ -804,7 +809,7 @@ void M_DrawReadThis1(void) lumpname = DEH_String(lumpname); - V_DrawPatchDirect (0, 0, 0, W_CacheLumpName(lumpname, PU_CACHE)); + V_DrawPatchDirect (0, 0, W_CacheLumpName(lumpname, PU_CACHE)); ReadDef1.x = skullx; ReadDef1.y = skully; @@ -822,7 +827,7 @@ void M_DrawReadThis2(void) // We only ever draw the second page if this is // gameversion == exe_doom_1_9 and gamemode == registered - V_DrawPatchDirect(0, 0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE)); + V_DrawPatchDirect(0, 0, W_CacheLumpName(DEH_String("HELP1"), PU_CACHE)); } @@ -831,7 +836,7 @@ void M_DrawReadThis2(void) // void M_DrawSound(void) { - V_DrawPatchDirect (60,38,0,W_CacheLumpName(DEH_String("M_SVOL"),PU_CACHE)); + V_DrawPatchDirect (60, 38, W_CacheLumpName(DEH_String("M_SVOL"), PU_CACHE)); M_DrawThermo(SoundDef.x,SoundDef.y+LINEHEIGHT*(sfx_vol+1), 16,sfxVolume); @@ -887,7 +892,8 @@ void M_MusicVol(int choice) // void M_DrawMainMenu(void) { - V_DrawPatchDirect (94,2,0,W_CacheLumpName(DEH_String("M_DOOM"),PU_CACHE)); + V_DrawPatchDirect(94, 2, + W_CacheLumpName(DEH_String("M_DOOM"), PU_CACHE)); } @@ -898,8 +904,8 @@ void M_DrawMainMenu(void) // void M_DrawNewGame(void) { - V_DrawPatchDirect (96,14,0,W_CacheLumpName(DEH_String("M_NEWG"),PU_CACHE)); - V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_SKILL"),PU_CACHE)); + V_DrawPatchDirect(96, 14, W_CacheLumpName(DEH_String("M_NEWG"), PU_CACHE)); + V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_SKILL"), PU_CACHE)); } void M_NewGame(int choice) @@ -926,7 +932,7 @@ int epi; void M_DrawEpisode(void) { - V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_EPISOD"),PU_CACHE)); + V_DrawPatchDirect(54, 38, W_CacheLumpName(DEH_String("M_EPISOD"), PU_CACHE)); } void M_VerifyNightmare(int ch) @@ -984,19 +990,20 @@ char msgNames[2][9] = {"M_MSGOFF","M_MSGON"}; void M_DrawOptions(void) { - V_DrawPatchDirect (108,15,0,W_CacheLumpName(DEH_String("M_OPTTTL"),PU_CACHE)); + V_DrawPatchDirect(108, 15, W_CacheLumpName(DEH_String("M_OPTTTL"), + PU_CACHE)); - V_DrawPatchDirect (OptionsDef.x + 175,OptionsDef.y+LINEHEIGHT*detail,0, - W_CacheLumpName(DEH_String(detailNames[detailLevel]), - PU_CACHE)); + V_DrawPatchDirect(OptionsDef.x + 175, OptionsDef.y + LINEHEIGHT * detail, + W_CacheLumpName(DEH_String(detailNames[detailLevel]), + PU_CACHE)); - V_DrawPatchDirect (OptionsDef.x + 120,OptionsDef.y+LINEHEIGHT*messages,0, - W_CacheLumpName(DEH_String(msgNames[showMessages]), - PU_CACHE)); + V_DrawPatchDirect(OptionsDef.x + 120, OptionsDef.y + LINEHEIGHT * messages, + W_CacheLumpName(DEH_String(msgNames[showMessages]), + PU_CACHE)); + + M_DrawThermo(OptionsDef.x, OptionsDef.y + LINEHEIGHT * (mousesens + 1), + 10, mouseSensitivity); - M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(mousesens+1), - 10,mouseSensitivity); - M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1), 9,screenSize); } @@ -1249,17 +1256,17 @@ M_DrawThermo int i; xx = x; - V_DrawPatchDirect (xx,y,0,W_CacheLumpName(DEH_String("M_THERML"),PU_CACHE)); + V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERML"), PU_CACHE)); xx += 8; for (i=0;i<thermWidth;i++) { - V_DrawPatchDirect (xx,y,0,W_CacheLumpName(DEH_String("M_THERMM"),PU_CACHE)); + V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMM"), PU_CACHE)); xx += 8; } - V_DrawPatchDirect (xx,y,0,W_CacheLumpName(DEH_String("M_THERMR"),PU_CACHE)); + V_DrawPatchDirect(xx, y, W_CacheLumpName(DEH_String("M_THERMR"), PU_CACHE)); - V_DrawPatchDirect ((x+8) + thermDot*8,y, - 0,W_CacheLumpName(DEH_String("M_THERMO"),PU_CACHE)); + V_DrawPatchDirect((x + 8) + thermDot * 8, y, + W_CacheLumpName(DEH_String("M_THERMO"), PU_CACHE)); } @@ -1269,8 +1276,8 @@ M_DrawEmptyCell ( menu_t* menu, int item ) { - V_DrawPatchDirect (menu->x - 10, menu->y+item*LINEHEIGHT - 1, 0, - W_CacheLumpName(DEH_String("M_CELL1"),PU_CACHE)); + V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1, + W_CacheLumpName(DEH_String("M_CELL1"), PU_CACHE)); } void @@ -1278,8 +1285,8 @@ M_DrawSelCell ( menu_t* menu, int item ) { - V_DrawPatchDirect (menu->x - 10, menu->y+item*LINEHEIGHT - 1, 0, - W_CacheLumpName(DEH_String("M_CELL2"),PU_CACHE)); + V_DrawPatchDirect(menu->x - 10, menu->y + item * LINEHEIGHT - 1, + W_CacheLumpName(DEH_String("M_CELL2"), PU_CACHE)); } @@ -1391,7 +1398,7 @@ M_WriteText w = SHORT (hu_font[c]->width); if (cx+w > SCREENWIDTH) break; - V_DrawPatchDirect(cx, cy, 0, hu_font[c]); + V_DrawPatchDirect(cx, cy, hu_font[c]); cx+=w; } } @@ -1884,14 +1891,14 @@ void M_Drawer (void) if (name[0]) { - V_DrawPatchDirect (x,y,0, W_CacheLumpName(name, PU_CACHE)); + V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE)); } y += LINEHEIGHT; } // DRAW SKULL - V_DrawPatchDirect(x + SKULLXOFF,currentMenu->y - 5 + itemOn*LINEHEIGHT, 0, + V_DrawPatchDirect(x + SKULLXOFF, currentMenu->y - 5 + itemOn*LINEHEIGHT, W_CacheLumpName(DEH_String(skullName[whichSkull]), PU_CACHE)); |