New patch: updated the debug call in pie_SetGammaValue. -- Knebel's Law: It is now proved beyond doubt that smoking is one of the leading causes of statistics.
Sun Oct 8 18:25:50 CEST 2006 [EMAIL PROTECTED] * Add gamma controls Use Alt-KeypadPlus/KeypadMinus to increase/decrease gamma. diff -rN -u -ud old-wz/lib/ivis_common/piestate.h new-wz/lib/ivis_common/piestate.h --- old-wz/lib/ivis_common/piestate.h 2006-10-08 18:26:27.805388638 +0200 +++ new-wz/lib/ivis_common/piestate.h 2006-10-08 18:26:28.132342152 +0200 @@ -139,7 +139,7 @@ /***************************************************************************/ extern void pie_SetDefaultStates(void);//Sets all states extern void pie_SetDepthBufferStatus(DEPTH_MODE depthMode); -extern WZ_DECL_DEPRECATED void pie_SetGammaValue(float val); +extern void pie_SetGammaValue(float val); //renderer capability extern void pie_SetTranslucent(BOOL val); extern BOOL pie_Translucent(void); diff -rN -u -ud old-wz/lib/ivis_opengl/piestate.c new-wz/lib/ivis_opengl/piestate.c --- old-wz/lib/ivis_opengl/piestate.c 2006-10-08 18:26:27.804388780 +0200 +++ new-wz/lib/ivis_opengl/piestate.c 2006-10-08 18:26:28.135341726 +0200 @@ -11,6 +11,7 @@ #ifdef _MSC_VER #include <windows.h> //needed for gl.h! --Qamly #endif +#include <SDL/SDL.h> #include <SDL/SDL_opengl.h> #include "lib/framework/frame.h" @@ -207,6 +208,8 @@ } /***************************************************************************/ -void pie_SetGammaValue(float val) // FIXME Remove if unused +void pie_SetGammaValue(float val) { + debug(LOG_VIDEO, "%s(%f)", __FUNCTION__, val); + SDL_SetGamma(val, val, val); } diff -rN -u -ud old-wz/src/configuration.c new-wz/src/configuration.c --- old-wz/src/configuration.c 2006-10-08 18:26:27.804388780 +0200 +++ new-wz/src/configuration.c 2006-10-08 18:26:28.150339594 +0200 @@ -33,7 +33,7 @@ #define DEFAULTFXVOL 80 #define DEFAULTCDVOL 60 -#define DEFAULTGAMMA 25 +#define DEFAULTGAMMA 20 #define DEFAULTSCROLL 800 #define DEFAULTMAPNAME "Rush" @@ -90,18 +90,20 @@ // ////////////////////////// // gamma - if(getWarzoneKeyNumeric("gamma", &val)) + if (getWarzoneKeyNumeric("gamma", &val)) { - gammaValue =(float)val/(float)25; - if(gammaValue<0.5)gammaValue =(float).5; + gammaValue = val / 20.0; + if (gammaValue < 0.5) + gammaValue = 0.5; pie_SetGammaValue(gammaValue); } else { - gammaValue =(float)DEFAULTGAMMA/(float)25; + gammaValue = DEFAULTGAMMA / 20.0; + if (gammaValue < 0.5) + gammaValue = 0.5; pie_SetGammaValue(gammaValue); - if(gammaValue<0.5)gammaValue =(float).5; - setWarzoneKeyNumeric("gamma", DEFAULTGAMMA); + setWarzoneKeyNumeric("gamma", gammaValue); } // ////////////////////////// @@ -536,7 +538,7 @@ setDifficultyLevel(DL_NORMAL); } setWarzoneKeyNumeric("allowSubtitles", war_GetAllowSubtitles()); - setWarzoneKeyNumeric("gamma",(DWORD)(gammaValue*25)); // gamma + setWarzoneKeyNumeric("gamma", (DWORD)(gammaValue * 20)); setWarzoneKeyNumeric("scroll",(DWORD)scroll_speed_accel); // scroll setWarzoneKeyNumeric("difficulty", getDifficultyLevel()); // level setWarzoneKeyNumeric("barmode",(DWORD)barMode); //energybars diff -rN -u -ud old-wz/src/display3d.c new-wz/src/display3d.c --- old-wz/src/display3d.c 2006-10-08 18:26:27.803388923 +0200 +++ new-wz/src/display3d.c 2006-10-08 18:26:28.158338456 +0200 @@ -1036,9 +1036,6 @@ gridCentreX = ( player.p.x + ((visibleXTiles/2)<<TILE_SHIFT) ); gridCentreZ = ( player.p.z + ((visibleYTiles/2)<<TILE_SHIFT) ); - - pie_SetGammaValue(gammaValue); - edgeTile.texture = 0; bEnergyBars = TRUE; diff -rN -u -ud old-wz/src/keybind.c new-wz/src/keybind.c --- old-wz/src/keybind.c 2006-10-08 18:26:27.801389207 +0200 +++ new-wz/src/keybind.c 2006-10-08 18:26:28.170336750 +0200 @@ -423,7 +423,8 @@ /* Raises the 3dfx gamma value */ void kf_RaiseGamma( void ) { - + gammaValue += 0.05; + pie_SetGammaValue(gammaValue); } // -------------------------------------------------------------------------- @@ -431,7 +432,8 @@ /* Lowers the threedfx gamma value */ void kf_LowerGamma( void ) { - + gammaValue -= 0.05; + pie_SetGammaValue(gammaValue); } // -------------------------------------------------------------------------- diff -rN -u -ud old-wz/src/keymap.c new-wz/src/keymap.c --- old-wz/src/keymap.c 2006-10-08 18:26:27.800389349 +0200 +++ new-wz/src/keymap.c 2006-10-08 18:26:28.171336608 +0200 @@ -250,6 +250,8 @@ kf_TriFlip, kf_UpDroidScale, kf_DownDroidScale, + kf_RaiseGamma, + kf_LowerGamma, NULL // last function! }; @@ -397,6 +399,8 @@ keyAddMapping(KEYMAP_ASSIGNABLE,KEY_LALT,KEY_S,KEYMAP_PRESSED,kf_ToggleShadows, "Toggles shadows"); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_LCTRL,KEY_TAB,KEYMAP_PRESSED,kf_ToggleRadarTerrain, "Toggle radar terrain"); keyAddMapping(KEYMAP_ASSIGNABLE,KEY_LSHIFT,KEY_TAB,KEYMAP_PRESSED,kf_ToggleRadarAllyEnemy, "Toggle ally-enemy radar view"); + keyAddMapping(KEYMAP_ASSIGNABLE, KEY_LALT, KEY_KP_MINUS, KEYMAP_PRESSED, kf_LowerGamma, "Lower gamma"); + keyAddMapping(KEYMAP_ASSIGNABLE, KEY_LALT, KEY_KP_PLUS, KEYMAP_PRESSED, kf_RaiseGamma, "Raise gamma"); // Some extra non QWERTY mappings but functioning in same way keyAddMapping(KEYMAP_ASSIGNABLE,KEY_IGNORE,KEY_COMMA,KEYMAP_PRESSED,kf_SetDroidRetreatMedium, strresGetString(psStringRes,STR_BIND_LDAM) ); @@ -505,15 +509,11 @@ ASSERT( newMapping != NULL, "Couldn't allocate memory for a key mapping" ); /* Plus one for the terminator */ - - - newMapping->pName = (STRING*)MALLOC(strlen(name)+1); ASSERT( newMapping->pName != NULL, "Couldn't allocate the memory for the string in a mapping" ); memSetBlockHeap(psHeap); - /* Copy over the name */ strcpy(newMapping->pName,name);
_______________________________________________ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev