From 01375dab2f4f0c9ce23ebd6c75cd439c1594205d Mon Sep 17 00:00:00 2001 From: meep-eep Date: Fri, 8 Apr 2005 19:03:55 +0000 Subject: [PATCH] Got rid of some warnings. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1620 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sc2/src/sc2code/process.c b/sc2/src/sc2code/process.c index 55f20ec98..728369ac5 100644 --- a/sc2/src/sc2code/process.c +++ b/sc2/src/sc2code/process.c @@ -40,7 +40,7 @@ SIZE zoom_out = 1 << ZOOM_SHIFT; static SIZE opt_max_zoom_out; #if 0 -static void inline +static inline void CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc) { int i, z; @@ -52,7 +52,7 @@ CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc) *sc = ((1 << i) << (ZOOM_SHIFT + 8)) / zoom_out; } #else -static void inline +static inline void CALC_ZOOM_STUFF (COUNT* idx, COUNT* sc) { int i; @@ -723,10 +723,12 @@ PreProcessQueue (PSIZE pscroll_x, PSIZE pscroll_y) if ((min_reduction > opt_max_zoom_out || min_reduction <= max_reduction) && (min_reduction = max_reduction) > opt_max_zoom_out && (min_reduction = zoom_out) > opt_max_zoom_out) + { if (optMeleeScale == TFB_SCALE_STEP) min_reduction = 0; else min_reduction = 1 << ZOOM_SHIFT; + } #ifdef KDEBUG fprintf (stderr, "PreProcess: exit\n");