Got rid of some warnings.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1620 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -40,7 +40,7 @@ SIZE zoom_out = 1 << ZOOM_SHIFT;
|
|||||||
static SIZE opt_max_zoom_out;
|
static SIZE opt_max_zoom_out;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static void inline
|
static inline void
|
||||||
CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc)
|
CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc)
|
||||||
{
|
{
|
||||||
int i, z;
|
int i, z;
|
||||||
@@ -52,7 +52,7 @@ CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc)
|
|||||||
*sc = ((1 << i) << (ZOOM_SHIFT + 8)) / zoom_out;
|
*sc = ((1 << i) << (ZOOM_SHIFT + 8)) / zoom_out;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static void inline
|
static inline void
|
||||||
CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc)
|
CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@@ -723,10 +723,12 @@ PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y)
|
|||||||
if ((min_reduction > opt_max_zoom_out || min_reduction <= max_reduction)
|
if ((min_reduction > opt_max_zoom_out || min_reduction <= max_reduction)
|
||||||
&& (min_reduction = max_reduction) > opt_max_zoom_out
|
&& (min_reduction = max_reduction) > opt_max_zoom_out
|
||||||
&& (min_reduction = zoom_out) > opt_max_zoom_out)
|
&& (min_reduction = zoom_out) > opt_max_zoom_out)
|
||||||
|
{
|
||||||
if (optMeleeScale == TFB_SCALE_STEP)
|
if (optMeleeScale == TFB_SCALE_STEP)
|
||||||
min_reduction = 0;
|
min_reduction = 0;
|
||||||
else
|
else
|
||||||
min_reduction = 1 << ZOOM_SHIFT;
|
min_reduction = 1 << ZOOM_SHIFT;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef KDEBUG
|
#ifdef KDEBUG
|
||||||
fprintf (stderr, "PreProcess: exit\n");
|
fprintf (stderr, "PreProcess: exit\n");
|
||||||
|
|||||||
Reference in New Issue
Block a user