immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spelling in app and main

fix-squashed-planets
Rasmus Brönnegård 2022-01-24 19:47:07 +01:00
parent 53053b901f
commit 6e0207ca5e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.cpp
View File

@ -593,7 +593,7 @@ bool CApplication::Create()
h = atoi(hs.c_str()); h = atoi(hs.c_str());
} }
// Why not just set m_deviceConfig.size to w,h? Because this way if the resolution is no longer supported (e.g. changimg monitor) defaults will be used instead // Why not just set m_deviceConfig.size to w,h? Because this way if the resolution is no longer supported (e.g. changing monitor) defaults will be used instead
for (auto it = modes.begin(); it != modes.end(); ++it) for (auto it = modes.begin(); it != modes.end(); ++it)
{ {
if (it->x == w && it->y == h) if (it->x == w && it->y == h)
@ -1866,7 +1866,7 @@ void CApplication::SetLanguage(Language language)
} }
else else
{ {
GetLogger()->Warn("Enviromnent locale ('%s') is not supported, setting default language\n", envLang); GetLogger()->Warn("Environment locale ('%s') is not supported, setting default language\n", envLang);
m_language = LANGUAGE_ENGLISH; m_language = LANGUAGE_ENGLISH;
} }
} }
@ -1935,7 +1935,7 @@ void CApplication::SetLanguage(Language language)
} }
catch (...) catch (...)
{ {
GetLogger()->Warn("Failed to update locale, possibly incorect system configuration. Will fallback to classic locale.\n"); GetLogger()->Warn("Failed to update locale, possibly incorrect system configuration. Will fallback to classic locale.\n");
try try
{ {
std::locale::global(std::locale::classic()); std::locale::global(std::locale::classic());

4
src/app/app.h
View File

@ -218,7 +218,7 @@ public:
//! Returns the relative time since last update [seconds] //! Returns the relative time since last update [seconds]
float GetRelTime() const; float GetRelTime() const;
//! Returns the exact realative time since last update [nanoseconds] //! Returns the exact relative time since last update [nanoseconds]
long long GetExactRelTime() const; long long GetExactRelTime() const;
//! Returns the exact relative time since last update disregarding speed setting [nanoseconds] //! Returns the exact relative time since last update disregarding speed setting [nanoseconds]
@ -411,7 +411,7 @@ protected:
//! Application language //! Application language
Language m_language; Language m_language;
//! Screen resoultion overriden by commandline //! Screen resolution overriden by commandline
bool m_resolutionOverride; bool m_resolutionOverride;
//! Headles mode //! Headles mode

6
src/app/main.cpp
View File

@ -60,14 +60,14 @@ object-oriented language, CBOT, which can be used to program the robots availabl
The original version of the game was developed by [Epsitec](http://www.epsitec.ch/) and released in 2001. The original version of the game was developed by [Epsitec](http://www.epsitec.ch/) and released in 2001.
Later, in 2005 another version named Ceebot was released. In March 2012, through attempts Later, in 2005 another version named Ceebot was released. In March 2012, through attempts
by Polish Colobot fans, Epsitec agreeed to release the source code of the game on GPLv3 license. by Polish Colobot fans, Epsitec agreed to release the source code of the game on GPLv3 license.
The license was given specifically to our community, <b>TerranovaTeam</b>, The license was given specifically to our community, <b>TerranovaTeam</b>,
part of <b>International Colobot Community (ICC)</b> (previously known as <i>Polish Portal of Colobot (PPC)</i>; part of <b>International Colobot Community (ICC)</b> (previously known as <i>Polish Portal of Colobot (PPC)</i>;
Polish: <i>Polski Portal Colobota</i>) with our website at http://colobot.info/. Polish: <i>Polski Portal Colobota</i>) with our website at http://colobot.info/.
\section Intro Introduction \section Intro Introduction
The source code released by Epitec was sparsely documented. This documentation, written from scratch, The source code released by Epsitec was sparsely documented. This documentation, written from scratch,
will aim to describe the various components of the code. will aim to describe the various components of the code.
Currently, the only documented classes are the ones written from scratch or the old ones rewritten Currently, the only documented classes are the ones written from scratch or the old ones rewritten
@ -92,7 +92,7 @@ The current layout is the following:
- src/graphics/opengl - concrete implementation of CDevice class in OpenGL: CGLDevice - src/graphics/opengl - concrete implementation of CDevice class in OpenGL: CGLDevice
- src/graphics/d3d - in (far) future - perhaps a newer implementation in DirectX (9? 10?) - src/graphics/d3d - in (far) future - perhaps a newer implementation in DirectX (9? 10?)
- src/math - mathematical structures and functions - src/math - mathematical structures and functions
- src/object - non-grphical game object logic, that is robots, buildings, etc. - src/object - non-graphical game object logic, that is robots, buildings, etc.
- src/level - main part of non-graphical game engine, that is loading levels etc. - src/level - main part of non-graphical game engine, that is loading levels etc.
- src/level/parser - parser for loading/saving level files from format known as <i>scene files</i> - src/level/parser - parser for loading/saving level files from format known as <i>scene files</i>
- src/ui - 2D user interface (menu, buttons, check boxes, etc.) - src/ui - 2D user interface (menu, buttons, check boxes, etc.)