From 828b5b9ec7818c7047e96aebeb67f79837cbc793 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Sun, 8 Jan 2017 18:14:29 +0100 Subject: [PATCH] Cleaned up Terrain::AddObject --- Source/Environment/Terrain.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Source/Environment/Terrain.cpp b/Source/Environment/Terrain.cpp index 79d31b2..6218c30 100644 --- a/Source/Environment/Terrain.cpp +++ b/Source/Environment/Terrain.cpp @@ -1137,36 +1137,27 @@ void Terrain::deleteDeadDecals() void Terrain::AddObject(XYZ where, float radius, int id) { - XYZ points[4]; - if (id >= 0 && id < 10000) + XYZ points[2]; + if (id >= 0 && id < 10000) { for (int i = 0; i < subdivision; i++) { for (int j = 0; j < subdivision; j++) { if (patchobjectnum[i][j] < 300 - 1) { - bool done = false; points[0].x = (size / subdivision) * i; points[0].z = (size / subdivision) * j; points[0].y = heightmap[(int)points[0].x][(int)points[0].z]; points[1].x = (size / subdivision) * (i + 1); - points[1].z = (size / subdivision) * j; + points[1].z = (size / subdivision) * (j + 1); points[1].y = heightmap[(int)points[1].x][(int)points[1].z]; - points[2].x = (size / subdivision) * (i + 1); - points[2].z = (size / subdivision) * (j + 1); - points[2].y = heightmap[(int)points[2].x][(int)points[2].z]; - points[3].x = (size / subdivision) * i; - points[3].z = (size / subdivision) * (j + 1); - points[3].y = heightmap[(int)points[3].x][(int)points[3].z]; points[0] *= scale; points[1] *= scale; - points[2] *= scale; - points[3] *= scale; - if (!done && where.x + radius > points[0].x && where.x - radius < points[2].x && where.z + radius > points[0].z && where.z - radius < points[2].z) { + if (where.x + radius > points[0].x && where.x - radius < points[1].x && where.z + radius > points[0].z && where.z - radius < points[1].z) { patchobjects[i][j][patchobjectnum[i][j]] = id; patchobjectnum[i][j]++; - done = 1; } } } } + } } void Terrain::DeleteDecal(int which) -- 2.39.2