Merge branch 'master' of git://github.com/matricks/teeworlds

2 files changed, 10 insertions, 2 deletions

diff --git a/bam.lua b/bam.lua
index 75f46316..6891894b 100644
--- a/bam.lua
+++ b/bam.lua
@@ -4,7 +4,7 @@ Import("configure.lua")
 Import("other/sdl/sdl.lua")
 Import("other/freetype/freetype.lua")
 
---- Setup Config --------
+--- Setup Config -------
 config = NewConfig()
 config:Add(OptCCompiler("compiler"))
 config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp
index 667ba213..e2f4ae4c 100644
--- a/src/engine/client/graphics.cpp
+++ b/src/engine/client/graphics.cpp
@@ -27,6 +27,7 @@
 #include <engine/keys.h>
 
 #include <math.h>
+#include <time.h>
 
 #include "graphics.h"
 
@@ -868,10 +869,17 @@ void CGraphics_SDL::Swap()
 		char aFilename[128];
 		static int Index = 1;
 
+		time_t Time;
+		char aDate[20];
+
+		time(&Time);
+		tm* TimeInfo = localtime(&Time);
+		strftime(aDate, sizeof(aDate), "%Y-%m-%d_%I-%M", TimeInfo);
+
 		for(; Index < 10000; Index++)
 		{
 			IOHANDLE io;
-			str_format(aFilename, sizeof(aFilename), "screenshots/screenshot%05d.png", Index);
+			str_format(aFilename, sizeof(aFilename), "screenshots/screenshot%s-%05d.png", aDate, Index);
 			io = m_pStorage->OpenFile(aFilename, IOFLAG_READ);
 			if(io)
 				io_close(io);