--- deliantra/server/common/los.C	2018/11/17 23:40:00	1.77
+++ deliantra/server/common/los.C	2018/12/05 19:03:26	1.78
@@ -88,7 +88,7 @@
 
   l.flags |= flags;
 
-  if (expect_false (l.flags & FLG_QUEUED))
+  if (ecb_expect_false (l.flags & FLG_QUEUED))
     return;
 
   l.flags |= FLG_QUEUED;
@@ -161,13 +161,13 @@
 
       los_info &l = los[x][y];
 
-      if (expect_true (l.flags & (FLG_XI | FLG_YI)))
+      if (ecb_expect_true (l.flags & (FLG_XI | FLG_YI)))
         {
           l.culled = 1;
           l.xo = l.yo = l.xe = l.ye = 0;
 
           // check contributing spaces, first horizontal
-          if (expect_true (l.flags & FLG_XI))
+          if (ecb_expect_true (l.flags & FLG_XI))
             {
               los_info *xi = &los[x - sign (dx)][y];
 
@@ -175,7 +175,7 @@
               l.culled &= !xi->visible;
 
               /* merge input space */
-              if (expect_false (xi->xo || xi->yo))
+              if (ecb_expect_false (xi->xo || xi->yo))
                 {
 	          // The X input can provide two main pieces of information:
 	          // 1. Progressive X obscurity.
@@ -202,7 +202,7 @@
             }
 		
           // check contributing spaces, last vertical, identical structure
-          if (expect_true (l.flags & FLG_YI))
+          if (ecb_expect_true (l.flags & FLG_YI))
             {
               los_info *yi = &los[x][y - sign (dy)];
 
@@ -210,7 +210,7 @@
               l.culled &= !yi->visible;
 
               /* merge input space */
-              if (expect_false (yi->yo || yi->xo))
+              if (ecb_expect_false (yi->yo || yi->xo))
                 {
 	          // The Y input can provide two main pieces of information:
 	          // 1. Progressive Y obscurity.
@@ -401,7 +401,7 @@
             ms.update ();
             sint8 light = ms.light;
 
-            if (expect_false (light))
+            if (ecb_expect_false (light))
               if (light < 0)
                 pass2 = 1;
               else
@@ -443,7 +443,7 @@
           ms.update ();
           sint8 light = ms.light;
 
-          if (expect_false (light < 0))
+          if (ecb_expect_false (light < 0))
             {
               light = clamp (light - bonus, 0, MAX_DARKNESS);
               apply_light<los_darken> (pl, dx - pl->viewpoint->x, dy - pl->viewpoint->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);