ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Daodan_GL.c

Comparing Daodan/src/Daodan_GL.c (file contents):
Revision 992 by alloc, Sat Apr 5 10:19:11 2014 UTC vs.
Revision 993 by alloc, Sun Apr 6 17:06:02 2014 UTC

#	Line 66 | Line 66 | unsigned short ONICALL DD_GLrEnumerateDi
66		unsigned int i;
67		signed int j;
68
69	<	DDrStartupMessage("Daodan: Listing display modes");
69	>	STARTUPMESSAGE("Listing display modes", 0);
70
71		memset(modes, 0, sizeof(M3tDisplayMode) * DD_MAX_MODES);
72
#	Line 169 | Line 169 | unsigned short ONICALL DD_GLrEnumerateDi
169		++vmodes;
170		}
171
172	<	DDrStartupMessage("Daodan: %u modes available:", vmodes);
172	>	STARTUPMESSAGE("%u modes available:", vmodes);
173		for (i = 0; i < vmodes; ++i)
174	<	DDrStartupMessage("Daodan:   %ux%ux%u", modes[i].Width, modes[i].Height, modes[i].Depth);
174	>	STARTUPMESSAGE("   %ux%ux%u", modes[i].Width, modes[i].Height, modes[i].Depth);
175
176		return vmodes;
177		}
#	Line 253 | Line 253 | UUtBool DD_GLrPlatform_SetDisplayMode(M3
253		}
254		else
255		{
256	<	if (opt_border)
256	>	ConfigOption_t* co = DDrConfig_GetOptOfType("options.border", C_BOOL);
257	>	if (co && co->value.intBoolVal)
258		{
259		pt.x = rc.left;
260		pt.y = rc.top;
#	Line 316 | Line 317 | UUtBool DD_GLrPlatform_SetDisplayMode(M3
317
318		static void ONICALL DD_GLiGamma_Restore(void)
319		{
320	<	if (opt_gamma)
320	>	ConfigOption_t* co = DDrConfig_GetOptOfType("options.gamma", C_BOOL);
321	>	if (co->value.intBoolVal)
322		{
323		if (gl_api->wglSetDeviceGammaRamp3DFX)
324		gl_api->wglSetDeviceGammaRamp3DFX(gl->hDC, GLgInitialGammaRamp);
#	Line 327 | Line 329 | static void ONICALL DD_GLiGamma_Restore(
329
330		static void ONICALL DD_GLiGamma_Initialize(void)
331		{
332	<	if (opt_gamma)
332	>	ConfigOption_t* co = DDrConfig_GetOptOfType("options.gamma", C_BOOL);
333	>	if (co->value.intBoolVal)
334		{
335		if (gl_api->wglSetDeviceGammaRamp3DFX)
336		{
#	Line 398 | Line 401 | UUtBool ONICALL DD_GLrPlatform_Initializ
401		goto exit_err;
402		}
403
404	<	if (!M3gResolutionSwitch && opt_gamma)
404	>	ConfigOption_t* co = DDrConfig_GetOptOfType("options.gamma", C_BOOL);
405	>	if (!M3gResolutionSwitch && co->value.intBoolVal)
406		{
407		UUrStartupMessage("Daodan: Ignoring gamma setting due to windowed mode");
408	<	opt_gamma = false;
408	>	co->value.intBoolVal = false;
409		}
410
411		DD_GLiGamma_Initialize();

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)