Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2015-12-29 15:03:12 +02:00
commit da34e717af
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
code/ryzom/client/src/interface_v3/action_handler_misc.cpp
View file

@ -666,12 +666,35 @@ bool screenshotZBuffer(const std::string &filename)
return true;
}
static std::string findNewScreenShotFileName(std::string filename)
{
static char cstime[25];
time_t dtime;
time(&dtime);
struct tm *tms = localtime(&dtime);
if (tms)
{
strftime(cstime, 25, "%Y-%m-%d", tms);
std::string::size_type pos = filename.find_last_of('.');
// fallback if no extension is given
if (pos == std::string::npos)
filename = filename + "_" + cstime + "_";
else
filename = filename.substr(0, pos) + "_" + cstime + "_" + filename.substr(pos);
}
// screenshot_YYYY-MM-DD_000.jpg
return CFile::findNewFile(filename);
}
void screenShotTGA()
{
CBitmap btm;
getBuffer (btm);
string filename = CFile::findNewFile (ScreenshotsDirectory+"screenshot.tga");
string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.tga");
COFile fs(filename);
if (!btm.writeTGA(fs, 24, false))
@ -693,7 +716,7 @@ void screenShotPNG()
CBitmap btm;
getBuffer (btm);
string filename = CFile::findNewFile (ScreenshotsDirectory+"screenshot.png");
string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.png");
COFile fs(filename);
if (!btm.writePNG(fs, 24))
@ -715,7 +738,7 @@ void screenShotJPG()
CBitmap btm;
getBuffer (btm);
string filename = CFile::findNewFile (ScreenshotsDirectory+"screenshot.jpg");
string filename = findNewScreenShotFileName(ScreenshotsDirectory+"screenshot.jpg");
COFile fs(filename);
if (!btm.writeJPG(fs))