Thr0lu5/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity

game: remove duplicate influence selection information

Browse Source
This commit is contained in:
Crypto City 2023-09-10 09:50:07 +00:00
parent f26116b200
commit a589c3a4fb
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/game/main-urho3d.cc
View File

@ -2310,32 +2310,6 @@ void CryptoCityUrho3D::UpdateTargetting()
snprintf(buf, sizeof(buf), "%.2f%%", GetPotential<uint32_t>(state, CACHED_INDEX_SOUTH_FACING, [state](uint32_t x, uint32_t y){ return cc::get_south_facing_1024(state, x, y); }, selection.x0, selection.y0, selection.x1, selection.y1) / (float)10.240f);
s += "\nSouth facing: " + std::string(buf);
}
if (HasSelectionInfo(selection_info_influences))
{
std::vector<std::shared_ptr<Flag>> res;
map.get_all_flags(res, gameState.cityState.id);
uint32_t influence[NUM_ROLES];
memset(influence, 0, sizeof(influence));
for (const std::shared_ptr<Flag> &f: res)
{
if (f->role == ROLE_EMPTY || f->role == ROLE_ROAD)
continue;
const uint32_t elevation_bonus = cc::get_elevation_bonus(f->role, f->elevation_bonus);
const bool good_harvest = gameState.cityState.has_special_event(cc::SPECIAL_EVENT_GOOD_HARVEST);
const bool bad_harvest = gameState.cityState.has_special_event(cc::SPECIAL_EVENT_BAD_HARVEST);
const uint32_t D = cc::get_cc_influence(f->x0, f->y0, f->x1, f->y1, f->role, f->economic_power, elevation_bonus, f->potential, good_harvest, bad_harvest);
const uint32_t squares = cc::intersection_squares(f->x0 - D, f->y0 - D, f->x1 + D, f->y1 + D, selection.x0, selection.y0, selection.x1, selection.y1);
influence[f->role] += squares;
}
for (uint8_t role = 0; role < NUM_ROLES; ++role)
{
if (influence[role] == 0)
continue;
influence[role] = (influence[role] + sel_w * sel_h / 2) / (sel_w * sel_h);
if (influence[role] > 0)
s += std::string("\n") + cc::get_role_name(role) + " influence: " + std::to_string(influence[role]);
}
}
if (HasSelectionInfo(selection_info_bridge_score))
{
char buf[32];

1
src/game/selection-info.cc
View File

@ -20,7 +20,6 @@ static const char *text[] =
"Slope",
"Temperature",
"South facing",
"Influences",
"Bridge score",
"Underwater area",
"Terrain feature",

1
src/game/selection-info.h
View File

@ -20,7 +20,6 @@ enum selection_info_t
selection_info_slope,
selection_info_temperature,
selection_info_south_facing,
selection_info_influences,
selection_info_bridge_score,
selection_info_underwater_area,
selection_info_terrain_feature,