Skip to content

Commit 7aae9c0

Browse files
committed
Remove video mode and fix hud.
1 parent 244ae4a commit 7aae9c0

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

prboom2/src/m_menu.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3267,8 +3267,8 @@ static const char *gltexformats[] = {
32673267
setup_menu_t gen_settings1[] = { // General Settings screen1
32683268

32693269
{"Video", S_SKIP|S_TITLE, m_null, G_X, G_Y+ 1*8},
3270+
#ifndef __PS2__
32703271
{"Video mode", S_CHOICE, m_null, G_X, G_Y+ 2*8, {"videomode"}, 0, 0, M_ChangeVideoMode, videomodes},
3271-
#ifndef __PS2__ /* Only 320x240 beyond that PS2 fps drops */
32723272
{"Screen Resolution", S_CHOICE, m_null, G_X, G_Y+ 3*8, {"screen_resolution"}, 0, 0, M_ChangeVideoMode, screen_resolutions_list},
32733273
#endif
32743274
{"Aspect Ratio", S_CHOICE, m_null, G_X, G_Y+ 4*8, {"render_aspect"}, 0, 0, M_ChangeAspectRatio, render_aspects_list},
@@ -3277,9 +3277,10 @@ setup_menu_t gen_settings1[] = { // General Settings screen1
32773277
#endif
32783278
{"Status Bar and Menu Appearance", S_CHOICE, m_null, G_X, G_Y+ 6*8, {"render_stretch_hud"}, 0, 0, M_ChangeStretch, render_stretch_list},
32793279
{"Vertical Sync", S_YESNO, m_null, G_X, G_Y+ 7*8, {"render_vsync"}, 0, 0, M_ChangeVideoMode},
3280-
#ifndef __PS2__
3280+
32813281
{"Enable Translucency", S_YESNO, m_null, G_X, G_Y+ 9*8, {"translucency"}, 0, 0, M_Trans},
32823282
{"Translucency filter percentage", S_NUM, m_null, G_X, G_Y+10*8, {"tran_filter_pct"}, 0, 0, M_Trans},
3283+
#ifndef __PS2__
32833284
{"Uncapped Framerate", S_YESNO, m_null, G_X, G_Y+11*8, {"uncapped_framerate"}, 0, 0, M_ChangeUncappedFrameRate},
32843285
#endif
32853286

prboom2/src/m_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ default_t defaults[] =
470470
{"videomode",{NULL, &default_videomode},{0,"8bit"},UL,UL,def_str,ss_none},
471471
/* 640x480 default resolution */
472472
#ifdef __PS2__
473-
{"screen_resolution",{NULL, &screen_resolution},{0,"320x200"},UL,UL,def_str,ss_none},
473+
{"screen_resolution",{NULL, &screen_resolution},{0,"320x240"},UL,UL,def_str,ss_none},
474474
#else
475475
{"screen_resolution",{NULL, &screen_resolution},{0,"640x480"},UL,UL,def_str,ss_none},
476476
#endif

0 commit comments

Comments
 (0)