aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.hpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-04-04 14:54:21 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-04-04 14:54:21 -0400
commita7bbe5cc18fe5b24f5d97d4acce164998d8d5517 (patch)
tree8ef8f0ce2303bbd0aef68c66e7687ec3ca216d30 /include/common.hpp
parentc74d256646cf0c438feee2ac703cc1f34b47b8ec (diff)
physics, removed extra couts
Diffstat (limited to 'include/common.hpp')
-rw-r--r--include/common.hpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/common.hpp b/include/common.hpp
index 2abd9db..c9837dd 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -180,7 +180,13 @@ extern float VOLUME_SFX;
*/
#define DEBUG_printf( message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__ )
-void C(std::string m);
+
+#ifdef SEGFAULT
+#define C(x) std::cout << m << std::endl
+#else
+#define C(x)
+#endif
+
/**
* Defines pi for calculations that need it.
*/
@@ -241,7 +247,7 @@ void safeSetColorA(int r,int g,int b,int a);
unsigned int millis(void);
#endif // __WIN32__
-int getdir(const char *dir, std::vector<std::string> &files);
+int getdir(std::string dir, std::vector<std::string> &files);
void strVectorSortAlpha(std::vector<std::string> *v);
const char *readFile(const char *path);