summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--library/modules/World.cpp2
m---------library/xml0
-rw-r--r--plugins/feature.cpp12
4 files changed, 8 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index a19302fe..81b55ffd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ build/bin
build/library
build/tools
build/plugins
+build/depends
#ignore Kdevelop stuff
.kdev4
diff --git a/library/modules/World.cpp b/library/modules/World.cpp
index 406303eb..cf3140e6 100644
--- a/library/modules/World.cpp
+++ b/library/modules/World.cpp
@@ -209,7 +209,7 @@ void World::SetCurrentWeather(uint8_t weather)
string World::ReadWorldFolder()
{
- return world->unk_192bd8.save_dir;
+ return world->cur_savegame.save_dir;
}
static PersistentDataItem dataFromHFig(df::historical_figure *hfig)
diff --git a/library/xml b/library/xml
-Subproject 24e809abe07eb139c9f53c358ed3fbd3d807541
+Subproject 136181f067a0a5ed19a19c9f98eece41003fe37
diff --git a/plugins/feature.cpp b/plugins/feature.cpp
index de0b270e..cadd91b6 100644
--- a/plugins/feature.cpp
+++ b/plugins/feature.cpp
@@ -33,9 +33,9 @@ static command_result feature(color_ostream &out, vector <string> &parameters)
{
if (parameters.size() != 1)
return CR_WRONG_USAGE;
- for (size_t i = 0; i < world->unk_192bd8.map_features.size(); i++)
+ for (size_t i = 0; i < world->cur_savegame.map_features.size(); i++)
{
- df::feature_init *feature_init = world->unk_192bd8.map_features[i];
+ df::feature_init *feature_init = world->cur_savegame.map_features[i];
string name;
feature_init->getName(&name);
out.print("Feature #%i (\"%s\", type %s) is %s\n", i, name.c_str(), ENUM_KEY_STR(feature_type, feature_init->getType()), feature_init->flags.is_set(feature_init_flags::Discovered) ? "discovered" : "hidden");
@@ -46,12 +46,12 @@ static command_result feature(color_ostream &out, vector <string> &parameters)
if (parameters.size() != 2)
return CR_WRONG_USAGE;
size_t i = atoi(parameters[1].c_str());
- if ((i < 0) || (i >= world->unk_192bd8.map_features.size()))
+ if ((i < 0) || (i >= world->cur_savegame.map_features.size()))
{
out.print("No such feature!\n");
return CR_FAILURE;
}
- df::feature_init *feature_init = world->unk_192bd8.map_features[i];
+ df::feature_init *feature_init = world->cur_savegame.map_features[i];
if (feature_init->flags.is_set(feature_init_flags::Discovered))
{
out.print("Selected feature is already discovered!\n");
@@ -67,12 +67,12 @@ static command_result feature(color_ostream &out, vector <string> &parameters)
if (parameters.size() != 2)
return CR_WRONG_USAGE;
size_t i = atoi(parameters[1].c_str());
- if ((i < 0) || (i >= world->unk_192bd8.map_features.size()))
+ if ((i < 0) || (i >= world->cur_savegame.map_features.size()))
{
out.print("No such feature!\n");
return CR_FAILURE;
}
- df::feature_init *feature_init = world->unk_192bd8.map_features[i];
+ df::feature_init *feature_init = world->cur_savegame.map_features[i];
if (!feature_init->flags.is_set(feature_init_flags::Discovered))
{
out.print("Selected feature is already hidden!\n");