Fixed the god-awful indentation

This commit is contained in:
mathusummut
2018-05-06 00:01:36 +02:00
parent 643e3820f5
commit 35b7b1f1a6
459 changed files with 204893 additions and 217545 deletions

View File

@@ -21,71 +21,73 @@
using namespace Shared::Platform;
using namespace Shared::Util;
namespace Shared { namespace Graphics {
namespace Shared {
namespace Graphics {
// =====================================================
// class FontManager
// =====================================================
FontManager::FontManager() {
if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
fonts.clear();
}
// =====================================================
// class FontManager
// =====================================================
FontManager::FontManager() {
if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == true) {
throw megaglest_runtime_error("Loading graphics in headless server mode not allowed!");
}
fonts.clear();
}
FontManager::~FontManager() {
end();
}
FontManager::~FontManager() {
end();
}
Font2D *FontManager::newFont2D() {
Font2D *font= GraphicsInterface::getInstance().getFactory()->newFont2D();
fonts.push_back(font);
return font;
}
Font2D *FontManager::newFont2D() {
Font2D *font = GraphicsInterface::getInstance().getFactory()->newFont2D();
fonts.push_back(font);
return font;
}
Font3D *FontManager::newFont3D() {
Font3D *font= GraphicsInterface::getInstance().getFactory()->newFont3D();
fonts.push_back(font);
return font;
}
Font3D *FontManager::newFont3D() {
Font3D *font = GraphicsInterface::getInstance().getFactory()->newFont3D();
fonts.push_back(font);
return font;
}
void FontManager::endFont(Font *font,bool mustExistInList) {
if(font != NULL) {
bool found = false;
for(unsigned int i=0; i < fonts.size(); ++i) {
if(fonts[i] != NULL && font == fonts[i]) {
found = true;
fonts.erase(fonts.begin() + i);
break;
void FontManager::endFont(Font *font, bool mustExistInList) {
if (font != NULL) {
bool found = false;
for (unsigned int i = 0; i < fonts.size(); ++i) {
if (fonts[i] != NULL && font == fonts[i]) {
found = true;
fonts.erase(fonts.begin() + i);
break;
}
}
if (found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endFont");
}
if (found == true) {
font->end();
delete font;
}
}
}
if(found == false && mustExistInList == true) {
throw std::runtime_error("found == false in endFont");
}
if(found == true) {
font->end();
delete font;
}
}
}
void FontManager::init() {
for(size_t i=0; i<fonts.size(); ++i) {
if(fonts[i] != NULL) {
fonts[i]->init();
void FontManager::init() {
for (size_t i = 0; i < fonts.size(); ++i) {
if (fonts[i] != NULL) {
fonts[i]->init();
}
}
}
}
}
void FontManager::end() {
for(size_t i=0; i<fonts.size(); ++i) {
if(fonts[i] != NULL) {
fonts[i]->end();
delete fonts[i];
fonts[i]=NULL;
void FontManager::end() {
for (size_t i = 0; i < fonts.size(); ++i) {
if (fonts[i] != NULL) {
fonts[i]->end();
delete fonts[i];
fonts[i] = NULL;
}
}
fonts.clear();
}
}
fonts.clear();
}
}}//end namespace
}
}//end namespace