MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename to getPlantAtTile; remove extra variables

develop
Ryan Williams 2021-06-23 23:03:22 -07:00 committed by GitHub
parent c5fb28a13c
commit c5e7a54d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/modules/Maps.cpp
Unescape Escape View File

@ -718,7 +718,7 @@ bool Maps::canStepBetween(df::coord pos1, df::coord pos2)
/* /*
* Plants * Plants
*/ */
df::plant *Maps::getPlantAtCoords(int32_t x, int32_t y, int32_t z) df::plant *Maps::getPlantAtTile(int32_t x, int32_t y, int32_t z)
{ {
if (x < 0 || x >= world->map.x_count || y < 0 || y >= world->map.y_count || !world->map.column_index) if (x < 0 || x >= world->map.x_count || y < 0 || y >= world->map.y_count || !world->map.column_index)
return NULL; return NULL;
@ -727,8 +727,6 @@ df::plant *Maps::getPlantAtCoords(int32_t x, int32_t y, int32_t z)
if (!mbc) if (!mbc)
return NULL; return NULL;
int32_t x_mod_48 = x % 48;
int32_t y_mod_48 = y % 48;
for (size_t i = 0; i < mbc->plants.size(); i++) for (size_t i = 0; i < mbc->plants.size(); i++)
{ {
df::plant *p = mbc->plants[i]; df::plant *p = mbc->plants[i];
@ -739,8 +737,8 @@ df::plant *Maps::getPlantAtCoords(int32_t x, int32_t y, int32_t z)
if (!t) if (!t)
continue; continue;
int32_t x_index = t->dim_x / 2 - p->pos.x % 48 + x_mod_48; int32_t x_index = (t->dim_x / 2) - (p->pos.x % 48) + (x % 48);
int32_t y_index = t->dim_y / 2 - p->pos.y % 48 + y_mod_48; int32_t y_index = (t->dim_y / 2) - (p->pos.y % 48) + (y % 48);
int32_t z_dis = z - p->pos.z; int32_t z_dis = z - p->pos.z;
if (x_index < 0 || x_index >= t->dim_x || y_index < 0 || y_index >= t->dim_y || z_dis >= t->body_height) if (x_index < 0 || x_index >= t->dim_x || y_index < 0 || y_index >= t->dim_y || z_dis >= t->body_height)
continue; continue;