From f608235b1e31d6f3d438069c4c9f2a3ab313b30e Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Thu, 29 Jan 2015 16:35:53 -0500 Subject: [PATCH] Fix some Lua things --- library/include/modules/Buildings.h | 3 --- library/include/modules/Units.h | 8 ++++---- library/modules/Buildings.cpp | 24 +++--------------------- library/modules/Units.cpp | 16 ++++++++-------- plugins/dwarfmonitor.cpp | 4 ++-- plugins/zone.cpp | 18 +++++++++--------- 6 files changed, 26 insertions(+), 47 deletions(-) diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h index a98c6c16d..5d0005963 100644 --- a/library/include/modules/Buildings.h +++ b/library/include/modules/Buildings.h @@ -292,9 +292,6 @@ DFHACK_EXPORT bool isActivityZone(df::building * building); DFHACK_EXPORT bool isPenPasture(df::building * building); DFHACK_EXPORT bool isPitPond(df::building * building); DFHACK_EXPORT bool isActive(df::building * building); -DFHACK_EXPORT bool isPenPasture(df::building_civzonest * building); -DFHACK_EXPORT bool isPitPond(df::building_civzonest * building); -DFHACK_EXPORT bool isActive(df::building_civzonest * building); DFHACK_EXPORT df::building* findPenPitAt(df::coord coord); } diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h index e7e17b6a0..655f13b5a 100644 --- a/library/include/modules/Units.h +++ b/library/include/modules/Units.h @@ -239,13 +239,13 @@ DFHACK_EXPORT bool isAvailableForAdoption(df::unit* unit); DFHACK_EXPORT bool isOwnCiv(df::unit* unit); DFHACK_EXPORT bool isOwnRace(df::unit* unit); -DFHACK_EXPORT std::string getRaceName(int32_t id); +DFHACK_EXPORT std::string getRaceNameById(int32_t race_id); DFHACK_EXPORT std::string getRaceName(df::unit* unit); -DFHACK_EXPORT std::string getRaceNamePlural(int32_t id); +DFHACK_EXPORT std::string getRaceNamePluralById(int32_t race_id); DFHACK_EXPORT std::string getRaceNamePlural(df::unit* unit); -DFHACK_EXPORT std::string getRaceBabyName(int32_t id); +DFHACK_EXPORT std::string getRaceBabyNameById(int32_t race_id); DFHACK_EXPORT std::string getRaceBabyName(df::unit* unit); -DFHACK_EXPORT std::string getRaceChildName(int32_t id); +DFHACK_EXPORT std::string getRaceChildNameById(int32_t race_id); DFHACK_EXPORT std::string getRaceChildName(df::unit* unit); DFHACK_EXPORT bool isBaby(df::unit* unit); diff --git a/library/modules/Buildings.cpp b/library/modules/Buildings.cpp index 27ec0e5d3..0ceaeb819 100644 --- a/library/modules/Buildings.cpp +++ b/library/modules/Buildings.cpp @@ -1188,45 +1188,27 @@ bool Buildings::isPenPasture(df::building * building) { if (!isActivityZone(building)) return false; - return isPenPasture((df::building_civzonest*) building); -} -bool Buildings::isPenPasture(df::building_civzonest* civ) -{ - CHECK_NULL_POINTER(civ); - return civ->zone_flags.bits.pen_pasture != 0; + return ((df::building_civzonest*) building)->zone_flags.bits.pen_pasture != 0; } bool Buildings::isPitPond(df::building * building) { if (!isActivityZone(building)) return false; - return isPitPond((df::building_civzonest *) building); -} - -bool Buildings::isPitPond(df::building_civzonest* civ) -{ - CHECK_NULL_POINTER(civ); - return civ->zone_flags.bits.pit_pond != 0; + return ((df::building_civzonest*) building)->zone_flags.bits.pit_pond != 0; } bool Buildings::isActive(df::building * building) { if (!isActivityZone(building)) return false; - return isActive((df::building_civzonest *) building); -} - -bool Buildings::isActive(df::building_civzonest* civ) -{ - CHECK_NULL_POINTER(civ); - return civ->zone_flags.bits.active != 0; + return ((df::building_civzonest*) building)->zone_flags.bits.active != 0; } // returns building of pen/pit at cursor position (NULL if nothing found) df::building* Buildings::findPenPitAt(df::coord coord) { - CHECK_NULL_POINTER(coord); vector zones; Buildings::findCivzonesAt(&zones, coord); for (auto zone = zones.begin(); zone != zones.end(); ++zone) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 6314d8090..a040521bd 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -897,7 +897,7 @@ bool Units::isOwnRace(df::unit* unit) } // get race name by id or unit pointer -string Units::getRaceName(int32_t id) +string Units::getRaceNameById(int32_t id) { df::creature_raw *raw = world->raws.creatures.all[id]; if (raw) @@ -907,11 +907,11 @@ string Units::getRaceName(int32_t id) string Units::getRaceName(df::unit* unit) { CHECK_NULL_POINTER(unit); - return getRaceName(unit->race); + return getRaceNameById(unit->race); } // get plural of race name (used for display in autobutcher UI and for sorting the watchlist) -string Units::getRaceNamePlural(int32_t id) +string Units::getRaceNamePluralById(int32_t id) { df::creature_raw *raw = world->raws.creatures.all[id]; if (raw) @@ -922,10 +922,10 @@ string Units::getRaceNamePlural(int32_t id) string Units::getRaceNamePlural(df::unit* unit) { CHECK_NULL_POINTER(unit); - return getRaceNamePlural(unit->race); + return getRaceNamePluralById(unit->race); } -string Units::getRaceBabyName(int32_t id) +string Units::getRaceBabyNameById(int32_t id) { df::creature_raw *raw = world->raws.creatures.all[id]; if (raw) @@ -936,10 +936,10 @@ string Units::getRaceBabyName(int32_t id) string Units::getRaceBabyName(df::unit* unit) { CHECK_NULL_POINTER(unit); - return getRaceBabyName(unit->race); + return getRaceBabyNameById(unit->race); } -string Units::getRaceChildName(int32_t id) +string Units::getRaceChildNameById(int32_t id) { df::creature_raw *raw = world->raws.creatures.all[id]; if (raw) @@ -950,7 +950,7 @@ string Units::getRaceChildName(int32_t id) string Units::getRaceChildName(df::unit* unit) { CHECK_NULL_POINTER(unit); - return getRaceChildName(unit->race); + return getRaceChildNameById(unit->race); } bool Units::isBaby(df::unit* unit) diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp index 1c93213b3..9a7d1f30c 100644 --- a/plugins/dwarfmonitor.cpp +++ b/plugins/dwarfmonitor.cpp @@ -1109,14 +1109,14 @@ struct preference_map case (T_type::LikeCreature): { label = "Creature :"; - Units::getRaceNamePlural(pref.creature_id); + Units::getRaceNamePluralById(pref.creature_id); break; } case (T_type::HateCreature): { label = "Hates :"; - Units::getRaceNamePlural(pref.creature_id); + Units::getRaceNamePluralById(pref.creature_id); break; } diff --git a/plugins/zone.cpp b/plugins/zone.cpp index 4fcc911f6..0c084d356 100644 --- a/plugins/zone.cpp +++ b/plugins/zone.cpp @@ -2433,7 +2433,7 @@ public: { if(!rconfig.isValid()) { - string keyname = "autobutcher/watchlist/" + getRaceName(raceId); + string keyname = "autobutcher/watchlist/" + getRaceNameById(raceId); rconfig = World::GetPersistentData(keyname, NULL); } if(rconfig.isValid()) @@ -2448,7 +2448,7 @@ public: else { // this should never happen - string keyname = "autobutcher/watchlist/" + getRaceName(raceId); + string keyname = "autobutcher/watchlist/" + getRaceNameById(raceId); out << "Something failed, could not find/create config key " << keyname << "!" << endl; } } @@ -2576,8 +2576,8 @@ std::vector watched_races; // helper for sorting the watchlist alphabetically bool compareRaceNames(WatchedRace* i, WatchedRace* j) { - string name_i = getRaceNamePlural(i->raceId); - string name_j = getRaceNamePlural(j->raceId); + string name_i = getRaceNamePluralById(i->raceId); + string name_j = getRaceNamePluralById(j->raceId); return (name_i < name_j); } @@ -2917,7 +2917,7 @@ command_result df_autobutcher(color_ostream &out, vector & parameters) bool found_race = false; for(size_t i=0; iraceId); + announce = "New race added to autobutcher watchlist: " + getRaceNamePluralById(w->raceId); Gui::showAnnouncement(announce, 2, false); autobutcher_sortWatchList(out); } @@ -3090,7 +3090,7 @@ command_result autoButcher( color_ostream &out, bool verbose = false ) stringstream ss; ss << slaughter_subcount; string announce; - announce = getRaceNamePlural(w->raceId) + " marked for slaughter: " + ss.str(); + announce = getRaceNamePluralById(w->raceId) + " marked for slaughter: " + ss.str(); Gui::showAnnouncement(announce, 2, false); } } @@ -3527,7 +3527,7 @@ static void autobutcher_setWatchListRace(color_ostream &out, unsigned id, unsign watched_races.push_back(w); string announce; - announce = "New race added to autobutcher watchlist: " + getRaceNamePlural(w->raceId); + announce = "New race added to autobutcher watchlist: " + getRaceNamePluralById(w->raceId); Gui::showAnnouncement(announce, 2, false); autobutcher_sortWatchList(out); } @@ -3622,7 +3622,7 @@ static int autobutcher_getWatchList(lua_State *L) WatchedRace * w = watched_races[i]; Lua::SetField(L, w->raceId, ctable, "id"); Lua::SetField(L, w->isWatched, ctable, "watched"); - Lua::SetField(L, getRaceNamePlural(w->raceId), ctable, "name"); + Lua::SetField(L, getRaceNamePluralById(w->raceId), ctable, "name"); Lua::SetField(L, w->fk, ctable, "fk"); Lua::SetField(L, w->mk, ctable, "mk"); Lua::SetField(L, w->fa, ctable, "fa");