assumed_identity -> identity

Atkana · Jul 29, 2014 · 1450298 · 1450298
1 parent 88dfb1f
commit 1450298
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
@@ -66,7 +66,7 @@ distribution.
 #include "df/item.h"
 #include "df/material.h"
 #include "df/viewscreen.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/nemesis_record.h"
 #include "df/historical_figure.h"
 #include "df/historical_entity.h"

diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h
@@ -41,7 +41,7 @@ namespace df
 {
     struct nemesis_record;
     struct burrow;
-    struct assumed_identity;
+    struct identity;
     struct historical_entity;
     struct entity_position_assignment;
     struct entity_position;
@@ -213,7 +213,7 @@ DFHACK_EXPORT df::item *getContainer(df::unit *unit);
 DFHACK_EXPORT void setNickname(df::unit *unit, std::string nick);
 DFHACK_EXPORT df::language_name *getVisibleName(df::unit *unit);
 
-DFHACK_EXPORT df::assumed_identity *getIdentity(df::unit *unit);
+DFHACK_EXPORT df::identity *getIdentity(df::unit *unit);
 DFHACK_EXPORT df::nemesis_record *getNemesis(df::unit *unit);
 
 DFHACK_EXPORT bool isHidingCurse(df::unit *unit);

diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp
@@ -61,7 +61,7 @@ using namespace std;
 #include "df/entity_position.h"
 #include "df/entity_position_assignment.h"
 #include "df/histfig_entity_link_positionst.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/burrow.h"
 #include "df/creature_raw.h"
 #include "df/caste_raw.h"
@@ -544,15 +544,15 @@ df::item *Units::getContainer(df::unit *unit)
     return findItemRef(unit->general_refs, general_ref_type::CONTAINED_IN_ITEM);
 }
 
-static df::assumed_identity *getFigureIdentity(df::historical_figure *figure)
+static df::identity *getFigureIdentity(df::historical_figure *figure)
 {
     if (figure && figure->info && figure->info->reputation)
-        return df::assumed_identity::find(figure->info->reputation->cur_identity);
+        return df::identity::find(figure->info->reputation->cur_identity);
 
     return NULL;
 }
 
-df::assumed_identity *Units::getIdentity(df::unit *unit)
+df::identity *Units::getIdentity(df::unit *unit)
 {
     CHECK_NULL_POINTER(unit);
 

diff --git a/plugins/cursecheck.cpp b/plugins/cursecheck.cpp
@@ -38,7 +38,7 @@ using namespace std;
 #include "df/historical_entity.h"
 #include "df/historical_figure.h"
 #include "df/historical_figure_info.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/language_name.h"
 #include "df/world.h"
 #include "df/world_raws.h"
@@ -104,7 +104,7 @@ void setUnitNickname(df::unit *unit, const std::string &nick)
         // v0.34.01: added the vampire's assumed identity
         if (figure->info && figure->info->reputation)
         {
-            auto identity = df::assumed_identity::find(figure->info->reputation->cur_identity);
+            auto identity = df::identity::find(figure->info->reputation->cur_identity);
 
             if (identity)
             {

diff --git a/plugins/rename.cpp b/plugins/rename.cpp
@@ -22,7 +22,7 @@
 #include "df/historical_entity.h"
 #include "df/historical_figure.h"
 #include "df/historical_figure_info.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/language_name.h"
 #include "df/building_stockpilest.h"
 #include "df/building_workshopst.h"

diff --git a/plugins/siege-engine.cpp b/plugins/siege-engine.cpp
@@ -42,7 +42,7 @@
 #include "df/creature_raw.h"
 #include "df/caste_raw.h"
 #include "df/caste_raw_flags.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/game_mode.h"
 #include "df/unit_misc_trait.h"
 #include "df/job.h"

diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp
@@ -25,7 +25,7 @@
 #include "df/historical_entity.h"
 #include "df/historical_figure.h"
 #include "df/historical_figure_info.h"
-#include "df/assumed_identity.h"
+#include "df/identity.h"
 #include "df/language_name.h"
 #include "df/incident.h"
 #include "df/crime.h"

diff --git a/scripts/devel/export-dt-ini.lua b/scripts/devel/export-dt-ini.lua
@@ -87,9 +87,9 @@ offset('dwarf_civ_index',globals,'ui','civ_id')
 vector('races_vector',globals,'world','raws','creatures','all')
 vector('reactions_vector',globals,'world','raws','reactions')
 vector('historical_figures',globals,'world','history','figures')
-vector('fake_identities',globals,'world','assumed_identities','all')
+vector('fake_identities',globals,'world','identities','all')
 vector('historical_figures_vector',globals,'world','history','figures')
-vector('fake_identities_vector',globals,'world','assumed_identities','all')
+vector('fake_identities_vector',globals,'world','identities','all')
 offset('fortress_entity',globals,'ui','main','fortress_entity')
 vector('historical_entities_vector',globals,'world','entities','all')
 vector('weapons_vector',globals,'world','raws','itemdefs','weapons')
@@ -178,9 +178,9 @@ offset('id',df.historical_figure,'id')
 offset('hist_fig_info',df.historical_figure,'info')
 offset('reputation',df.historical_figure_info,'reputation')
 offset('current_ident',df.historical_figure_info.T_reputation,'cur_identity')
-offset('fake_name',df.assumed_identity,'name')
-offset('fake_birth_year',df.assumed_identity,'birth_year')
-offset('fake_birth_time',df.assumed_identity,'birth_second')
+offset('fake_name',df.identity,'name')
+offset('fake_birth_year',df.identity,'birth_year')
+offset('fake_birth_time',df.identity,'birth_second')
 
 header('weapon_offsets')
 offset('name_plural',df.itemdef_weaponst,'name_plural')