From: <ave...@us...> - 2009-11-29 21:41:11
|
Revision: 7437 http://gemrb.svn.sourceforge.net/gemrb/?rev=7437&view=rev Author: avenger_teambg Date: 2009-11-29 21:41:02 +0000 (Sun, 29 Nov 2009) Log Message: ----------- don't crash on NULL tint Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Map.cpp Modified: gemrb/trunk/gemrb/plugins/Core/Map.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Map.cpp 2009-11-28 19:13:56 UTC (rev 7436) +++ gemrb/trunk/gemrb/plugins/Core/Map.cpp 2009-11-29 21:41:02 UTC (rev 7437) @@ -3176,7 +3176,10 @@ Color c = LightMap->GetPixel(Pos.x/16, Pos.y/12); // at night/dusk/dawn the lightmap color is adjusted by the color overlay. (Only get's darker.) const Color *tint = core->GetGame()->GetGlobalTint(); - return ((c.r-tint->r)*114 + (c.g-tint->g)*587 + (c.b-tint->b)*299)/2550; + if (tint) { + return ((c.r-tint->r)*114 + (c.g-tint->g)*587 + (c.b-tint->b)*299)/2550; + } + return (c.r*114+c.g*587+c.b*299)/2550; } ////////////////////AreaAnimation////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |