Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-02-24 21:44:57 +0000
committerStijn Buys <ingar@osirion.org>2011-02-24 21:44:57 +0000
commitdf77c743df304c644bebc321fc173125528a8d67 (patch)
tree45765b14f35b8f9d7a8ecd3472b8c9729ff84373 /src
parentb349294408a6f82bb5a5687a0672e8f04d4d681f (diff)
Applied Thorn's unknown spelling purification patch.
Diffstat (limited to 'src')
-rw-r--r--src/core/descriptions.cc4
-rw-r--r--src/filesystem/inifile.cc2
-rw-r--r--src/filesystem/inifile.h2
-rw-r--r--src/game/base/cargo.cc2
-rw-r--r--src/game/base/faction.cc2
-rw-r--r--src/game/base/game.cc28
-rw-r--r--src/game/base/shipmodel.cc4
-rw-r--r--src/game/base/template.cc2
-rw-r--r--src/game/intro/intro.cc8
-rw-r--r--src/render/particles.cc2
-rw-r--r--src/ui/ui.cc12
11 files changed, 34 insertions, 34 deletions
diff --git a/src/core/descriptions.cc b/src/core/descriptions.cc
index 2cfab99..0812ee7 100644
--- a/src/core/descriptions.cc
+++ b/src/core/descriptions.cc
@@ -217,7 +217,7 @@ bool Descriptions::load_entity_menus(core::Entity *entity, const std::string &me
aux::strip_quotes(strval);
menu->set_text(strval);
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
} else if (inifile.in_section("button")) {
@@ -248,7 +248,7 @@ bool Descriptions::load_entity_menus(core::Entity *entity, const std::string &me
inifile.unknown_value();
}
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
diff --git a/src/filesystem/inifile.cc b/src/filesystem/inifile.cc
index e82de41..5f87591 100644
--- a/src/filesystem/inifile.cc
+++ b/src/filesystem/inifile.cc
@@ -298,7 +298,7 @@ void IniFile::unknown_value() const
con_warn << name() << " unknown value '" << value() << "' for key '" << key() << "' at line " << line() << std::endl;
}
-void IniFile::unkown_key() const
+void IniFile::unknown_key() const
{
con_warn << name() << " unknown key '" << key() << "' at line " << line() << std::endl;
}
diff --git a/src/filesystem/inifile.h b/src/filesystem/inifile.h
index 4b94dcd..660a981 100644
--- a/src/filesystem/inifile.h
+++ b/src/filesystem/inifile.h
@@ -96,7 +96,7 @@ public:
void unknown_value() const;
/// print a default unkown key error
- void unkown_key() const;
+ void unknown_key() const;
/// print a default unkown section error
void unknown_section() const;
diff --git a/src/game/base/cargo.cc b/src/game/base/cargo.cc
index 7953185..c07aada 100644
--- a/src/game/base/cargo.cc
+++ b/src/game/base/cargo.cc
@@ -77,7 +77,7 @@ bool Cargo::init()
continue;
} else {
- cargoini.unkown_key();
+ cargoini.unknown_key();
}
}
diff --git a/src/game/base/faction.cc b/src/game/base/faction.cc
index 0220d3d..3466265 100644
--- a/src/game/base/faction.cc
+++ b/src/game/base/faction.cc
@@ -87,7 +87,7 @@ bool Faction::init()
faction->set_color_second(colorvalue);
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 7019089..89c6baf 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -1071,7 +1071,7 @@ bool Game::load_world()
zone = new core::Zone(label);
core::Zone::add(zone);
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
@@ -1251,14 +1251,14 @@ bool Game::load_zone(core::Zone *zone)
zone->set_sky(strval);
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("star")) {
if (core::Parser::got_entity_key(zoneini, star)) {
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("navpoint")) {
@@ -1272,7 +1272,7 @@ bool Game::load_zone(core::Zone *zone)
faction->apply(navpoint);
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("jumppoint")) {
@@ -1282,7 +1282,7 @@ bool Game::load_zone(core::Zone *zone)
jumppoint->set_targetlabel(strval);
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("jumpgate")) {
@@ -1306,7 +1306,7 @@ bool Game::load_zone(core::Zone *zone)
jumppoint->set_targetlabel(strval);
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("planet")) {
@@ -1331,7 +1331,7 @@ bool Game::load_zone(core::Zone *zone)
faction->apply(planet);
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("station")) {
@@ -1363,21 +1363,21 @@ bool Game::load_zone(core::Zone *zone)
shipmodel->apply(station);
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("racetrack")) {
if (core::Parser::got_entity_key(zoneini, racetrack)) {
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("checkpoint")) {
if (core::Parser::got_entity_key(zoneini, checkpoint)) {
continue;
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("entity")) {
@@ -1418,7 +1418,7 @@ bool Game::load_zone(core::Zone *zone)
// TODO apply ship model
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("cargo")) {
@@ -1450,7 +1450,7 @@ bool Game::load_zone(core::Zone *zone)
item->set_amount(l);
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
} else if (zoneini.in_section("ship")) {
@@ -1479,7 +1479,7 @@ bool Game::load_zone(core::Zone *zone)
}
} else {
- zoneini.unkown_key();
+ zoneini.unknown_key();
}
}
}
@@ -1657,7 +1657,7 @@ bool Game::load_settings()
aux::to_label(str);
Default::shipmodel = ShipModel::find(str);
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc
index ec712ac..25c2268 100644
--- a/src/game/base/shipmodel.cc
+++ b/src/game/base/shipmodel.cc
@@ -59,7 +59,7 @@ bool ShipModel::init()
if (Template::got_template_key(inifile, entitytemplate)) {
continue;
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
} else if (inifile.section().compare("ship") == 0) {
@@ -141,7 +141,7 @@ bool ShipModel::init()
shipmodel->set_template(entitytemplate);
}
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
diff --git a/src/game/base/template.cc b/src/game/base/template.cc
index 253562d..7ef4106 100644
--- a/src/game/base/template.cc
+++ b/src/game/base/template.cc
@@ -116,7 +116,7 @@ bool Template::init()
if (got_template_key(inifile, entitytemplate)) {
continue;
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index 8d44391..25e4d59 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -97,7 +97,7 @@ bool Intro::load_world()
zone->set_sky(strval);
} else if (inifile.got_key()) {
- inifile.unkown_key();
+ inifile.unknown_key();
}
} else if (inifile.in_section("entity")) {
@@ -105,7 +105,7 @@ bool Intro::load_world()
if (core::Parser::got_entity_key(inifile, entity)) {
continue;
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
} else if (inifile.in_section("globe")) {
@@ -114,7 +114,7 @@ bool Intro::load_world()
continue;
} else if (inifile.got_key()) {
- inifile.unkown_key();
+ inifile.unknown_key();
}
} else if (inifile.in_section("convoy")) {
@@ -141,7 +141,7 @@ bool Intro::load_world()
convoy->add(strval);
} else if (inifile.got_key()) {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
diff --git a/src/render/particles.cc b/src/render/particles.cc
index 2e65449..b772f56 100644
--- a/src/render/particles.cc
+++ b/src/render/particles.cc
@@ -211,7 +211,7 @@ ParticleScript *ParticleScript::load(const std::string &label)
continue;
} else {
- inifile.unkown_key();
+ inifile.unknown_key();
}
}
}
diff --git a/src/ui/ui.cc b/src/ui/ui.cc
index a5ef883..b162394 100644
--- a/src/ui/ui.cc
+++ b/src/ui/ui.cc
@@ -200,7 +200,7 @@ void UI::load_settings()
elementmargin = m;
continue;
} else {
- ini.unkown_key();
+ ini.unknown_key();
continue;
}
@@ -234,7 +234,7 @@ void UI::load_settings()
ui_palette->set_debug(color);
continue;
} else {
- ini.unkown_key();
+ ini.unknown_key();
continue;
}
@@ -244,7 +244,7 @@ void UI::load_settings()
ui_palette->set_mission(color);
continue;
} else {
- ini.unkown_key();
+ ini.unknown_key();
continue;
}
@@ -275,7 +275,7 @@ void UI::load_settings()
} else if (ini.got_key_string("background", strval)) {
menu->set_background_texture(strval);
} else {
- ini.unkown_key();
+ ini.unknown_key();
}
} else if (ini.in_section("button")) {
@@ -303,7 +303,7 @@ void UI::load_settings()
ini.unknown_value();
}
} else {
- ini.unkown_key();
+ ini.unknown_key();
}
} else if (ini.in_section("label")) {
@@ -322,7 +322,7 @@ void UI::load_settings()
ini.unknown_value();
}
} else {
- ini.unkown_key();
+ ini.unknown_key();
}
}