Skip to content

Commit 5ed736f

Browse files
committed
texture filter: rename new pref to be consistent (do => display option)
1 parent 43da0d1 commit 5ed736f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/GameSrc/wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1945,7 +1945,7 @@ void video_screen_init(void) {
19451945
if(can_use_opengl() && gShockPrefs.doUseOpenGL) {
19461946
standard_button_rect(&r, i, 2, 2, 2);
19471947
multi_init(i, 't', REF_STR_TEXTFILT, REF_STR_TFUNFIL, ID_NULL,
1948-
sizeof(gShockPrefs.textureFilter), &gShockPrefs.textureFilter, 2, renderer_dealfunc, &r);
1948+
sizeof(gShockPrefs.doTextureFilter), &gShockPrefs.doTextureFilter, 2, renderer_dealfunc, &r);
19491949
i++;
19501950
}
19511951
#endif

src/MacSrc/Prefs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void SetDefaultPrefs(void) {
113113
gShockPrefs.doResolution = 0; // High-res.
114114
gShockPrefs.doDetail = 3; // Max detail.
115115
gShockPrefs.doUseOpenGL = false;
116-
gShockPrefs.textureFilter = 0; // unfiltered
116+
gShockPrefs.doTextureFilter = 0; // unfiltered
117117
gShockPrefs.goOnScreenHelp = true;
118118
gShockPrefs.doGamma = 29; // Default gamma (29 out of 100).
119119
gShockPrefs.goMsgLength = 0; // Normal
@@ -211,7 +211,7 @@ OSErr LoadPrefs(void) {
211211
} else if (strcasecmp(key, PREF_TEX_FILTER) == 0) {
212212
int mode = atoi(value);
213213
if (mode >= 0 && mode <= 1)
214-
gShockPrefs.textureFilter = (short)mode;
214+
gShockPrefs.doTextureFilter = (short)mode;
215215
} else if (strcasecmp(key, PREF_ONSCR_HELP) == 0) {
216216
gShockPrefs.goOnScreenHelp = is_true(value);
217217
} else if (strcasecmp(key, PREF_GAMMA) == 0) {
@@ -264,7 +264,7 @@ OSErr SavePrefs(void) {
264264
fprintf(f, "%s = %s\n", PREF_HALFRES, DoubleSize ? "yes" : "no");
265265
fprintf(f, "%s = %d\n", PREF_DETAIL, _fr_global_detail);
266266
fprintf(f, "%s = %s\n", PREF_USE_OPENGL, gShockPrefs.doUseOpenGL ? "yes" : "no");
267-
fprintf(f, "%s = %d\n", PREF_TEX_FILTER, gShockPrefs.textureFilter);
267+
fprintf(f, "%s = %d\n", PREF_TEX_FILTER, gShockPrefs.doTextureFilter);
268268
fprintf(f, "%s = %s\n", PREF_ONSCR_HELP, gShockPrefs.goOnScreenHelp ? "yes" : "no");
269269
fprintf(f, "%s = %d\n", PREF_GAMMA, gShockPrefs.doGamma);
270270
fprintf(f, "%s = %d\n", PREF_MSG_LENGTH, gShockPrefs.goMsgLength);

src/MacSrc/Prefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct {
5959
// 0 => unfiltered
6060
// 1 => bilinear
6161
// TODO: add trilinear, anisotropic?
62-
short textureFilter;
62+
short doTextureFilter;
6363
} ShockPrefs;
6464

6565
//--------------------

0 commit comments

Comments
 (0)