From a83d037394f37403918b62fdc0083d4b84ea02db Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 16 Dec 2015 07:27:06 -0500
Subject: music/merge

---
 main.cpp | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'main.cpp')

diff --git a/main.cpp b/main.cpp
index 5b9b1b6..a9cc2fa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,7 +4,6 @@
 */
 
 #include <cstdio> // fopen
-#include <chrono> // see millis()
 
 #include <common.h>
 #include <world.h>
@@ -188,25 +187,6 @@ std::string readFile(const char *filePath) {
 
 vec2 offset;																			/*	OFFSET!!!!!!!!!!!!!!!!!!!! */
 
-/**
- *	millis
- *
- *	We've encountered many problems when attempting to create delays for triggering
- *	the logic function. As a result, we decided on using the timing libraries given
- *	by <chrono> in the standard C++ library. This function simply returns the amount
- *	of milliseconds that have passed sine the epoch.
- *
-**/
-
-#ifdef __WIN32__
-#define millis()	SDL_GetTicks()
-#else
-unsigned int millis(void){
-	std::chrono::system_clock::time_point now=std::chrono::system_clock::now();
-	return std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
-}
-#endif
-
 extern WEATHER weather;
 
 extern bool fadeEnable;
-- 
cgit v1.2.3