X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/blobdiff_plain/8dc79b2cdfc3d2250707e65d2c355033203b8712..6f214ac0ef5899987197c2e4c9baa0b51a04c197:/src/sim/g_smmaps.c diff --git a/src/sim/g_smmaps.c b/src/sim/g_smmaps.c index 8b5f345..e66ad40 100644 --- a/src/sim/g_smmaps.c +++ b/src/sim/g_smmaps.c @@ -367,29 +367,29 @@ int dynamicFilter(int col, int row) c = col >>1; if (((DynamicData[0] > DynamicData[1]) || - ((x = PopDensity[c][r]) >= DynamicData[0]) && - (x <= DynamicData[1])) && + (((x = PopDensity[c][r]) >= DynamicData[0]) && + (x <= DynamicData[1]))) && ((DynamicData[2] > DynamicData[3]) || - ((x = RateOGMem[c>>2][r>>2]) >= ((2 * DynamicData[2]) - 256)) && - (x <= ((2 * DynamicData[3]) - 256))) && + (((x = RateOGMem[c>>2][r>>2]) >= ((2 * DynamicData[2]) - 256)) && + (x <= ((2 * DynamicData[3]) - 256)))) && ((DynamicData[4] > DynamicData[5]) || - ((x = TrfDensity[c][r]) >= DynamicData[4]) && - (x <= DynamicData[5])) && + (((x = TrfDensity[c][r]) >= DynamicData[4]) && + (x <= DynamicData[5]))) && ((DynamicData[6] > DynamicData[7]) || - ((x = PollutionMem[c][r]) >= DynamicData[6]) && - (x <= DynamicData[7])) && + (((x = PollutionMem[c][r]) >= DynamicData[6]) && + (x <= DynamicData[7]))) && ((DynamicData[8] > DynamicData[9]) || - ((x = CrimeMem[c][r]) >= DynamicData[8]) && - (x <= DynamicData[9])) && + (((x = CrimeMem[c][r]) >= DynamicData[8]) && + (x <= DynamicData[9]))) && ((DynamicData[10] > DynamicData[11]) || - ((x = LandValueMem[c][r]) >= DynamicData[10]) && - (x <= DynamicData[11])) && + (((x = LandValueMem[c][r]) >= DynamicData[10]) && + (x <= DynamicData[11]))) && ((DynamicData[12] > DynamicData[13]) || - ((x = PoliceMapEffect[c>>2][r>>2]) >= DynamicData[12]) && - (x <= DynamicData[13])) && + (((x = PoliceMapEffect[c>>2][r>>2]) >= DynamicData[12]) && + (x <= DynamicData[13]))) && ((DynamicData[14] > DynamicData[15]) || - ((x = FireRate[c>>2][r>>2]) >= DynamicData[14]) && - (x <= DynamicData[15]))) { + (((x = FireRate[c>>2][r>>2]) >= DynamicData[14]) && + (x <= DynamicData[15])))) { return 1; } else { return 0;