marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C4LoaderScreen: use const string reference 

C4LoaderScreen: compare file extension case-insensitive
install-platforms
Kanibal 2017-08-27 21:44:53 +02:00 committed by Julius Michaelis
parent 384472f183
commit 4dd97d266e
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/C4LoaderScreen.cpp
View File

@ -25,10 +25,6 @@
#include "lib/C4LogBuf.h"
#include "lib/C4Random.h"
// allow combination of loader flags
inline C4LoaderScreen::Flag operator|(C4LoaderScreen::Flag a, C4LoaderScreen::Flag b) {
return static_cast<C4LoaderScreen::Flag>(static_cast<int>(a) | static_cast<int>(b));
}
C4LoaderScreen::C4LoaderScreen()
{
@ -104,7 +100,7 @@ void C4LoaderScreen::SetBlackScreen(bool fIsBlack)
// will be updated when drawn next time
}
void C4LoaderScreen::SeekLoaderScreens(C4Group &rFromGrp, const std::string wildcard)
void C4LoaderScreen::SeekLoaderScreens(C4Group &rFromGrp, const std::string &wildcard)
{
// seek for png, jpg, jpeg, bmp
char filename[_MAX_PATH + 1];
@ -112,9 +108,9 @@ void C4LoaderScreen::SeekLoaderScreens(C4Group &rFromGrp, const std::string wild
{
// potential candidate - check file extension
std::string extension{ GetExtension(filename) };
std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
if (extension == "png" || extension == "jpg" || extension == "jpeg" || extension == "bmp") {
auto loader = std::pair<C4Group*, std::string>{ &rFromGrp, std::string(filename) };
loaders.emplace(loader);
loaders.emplace(&rFromGrp, std::string(filename));
}
}
}

4
src/gui/C4LoaderScreen.h
View File

@ -24,7 +24,7 @@
class C4LoaderScreen
{
public:
enum Flag {
enum Flag: int {
BLACK = 0x00,
BACKGROUND = 0x01,
TITLE = 0x02,
@ -42,7 +42,7 @@ protected:
bool fBlackScreen; // if set, a black screen is drawn instead of a loader
std::map<C4Group*, const std::string> loaders;
void SeekLoaderScreens(C4Group &rFromGrp, const std::string wildcard);
void SeekLoaderScreens(C4Group &rFromGrp, const std::string &wildcard);
public:
C4LoaderScreen();