Skip to content

Commit cacb0b0

Browse files
committed
Don't force parameters in yquake2
Renderer is set in default config, so it can be changed later GLES1 is not set in unsupported OSs GLES3 is set in supported hardware Disable "point parameters" GL extension support in Bullseye or newer
1 parent 111a035 commit cacb0b0

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

scriptmodules/ports/yquake2.sh

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,24 +96,30 @@ function game_data_yquake2() {
9696

9797

9898
function configure_yquake2() {
99-
local params=()
100-
101-
if isPlatform "gl3"; then
102-
params+=("+set vid_renderer gl3")
103-
elif isPlatform "gles"; then
104-
params+=("+set vid_renderer gles1")
105-
elif isPlatform "gl" || isPlatform "mesa"; then
106-
params+=("+set vid_renderer gl1")
107-
else
108-
params+=("+set vid_renderer soft")
109-
fi
99+
local config="$md_conf_root/quake2/yquake2/baseq2/yq2.cfg"
100+
local renderer="soft"
110101

111102
mkRomDir "ports/quake2"
112103

113104
moveConfigDir "$home/.yq2" "$md_conf_root/quake2/yquake2"
114105
mkUserDir "$md_conf_root/quake2/yquake2/baseq2"
115-
copyDefaultConfig "$md_data/yq2.cfg" "$md_conf_root/quake2/yquake2/baseq2/yq2.cfg"
106+
107+
copyDefaultConfig "$md_data/yq2.cfg" "$config"
108+
iniConfig " " '"' "$config"
109+
110+
if isPlatform "gl3"; then
111+
renderer="gl3"
112+
elif isPlatform "gles3"; then
113+
renderer="gles3"
114+
elif isPlatform "gles" && [[ "$__os_debian_ver" -lt 11 ]]; then
115+
renderer="gles1"
116+
iniSet "set gl1_pointparameters" "1"
117+
elif isPlatform "gl" || isPlatform "mesa"; then
118+
renderer="gl1"
119+
fi
120+
121+
iniSet "set vid_renderer" "$renderer"
116122

117123
[[ "$md_mode" == "install" ]] && game_data_yquake2
118-
add_games_yquake2 "$md_inst/quake2 -datadir $romdir/ports/quake2 ${params[*]} +set game %ROM%"
124+
add_games_yquake2 "$md_inst/quake2 -datadir $romdir/ports/quake2 +set game %ROM%"
119125
}

scriptmodules/ports/yquake2/yq2.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ set s_openal "0"
3737
set ogg_ignoretrack0 "1"
3838

3939
// Video options
40+
set vid_renderer "soft"
4041
set gl1_discardfb "1"
4142
set gl1_lightmapcopies "1"
43+
set gl1_pointparameters "0"
4244
set r_mode "-2"

0 commit comments

Comments
 (0)