From a83d037394f37403918b62fdc0083d4b84ea02db Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Wed, 16 Dec 2015 07:27:06 -0500 Subject: music/merge --- include/common.h | 13 +++++++++++++ include/ui.h | 11 ++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index 31126d7..08ec73f 100644 --- a/include/common.h +++ b/include/common.h @@ -160,4 +160,17 @@ void safeSetColor(int r,int g,int b); void safeSetColorA(int r,int g,int b,int a); +/** + * 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 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); +#endif // __WIN32__ + #endif // COMMON_H diff --git a/include/ui.h b/include/ui.h index 5d17c47..6a81dab 100644 --- a/include/ui.h +++ b/include/ui.h @@ -1,3 +1,7 @@ +/** @file ui.h + * @brief Contains functions for handling the user interface. + */ + #ifndef UI_H #define UI_H @@ -12,9 +16,9 @@ namespace ui { - /* - * Contains the coordinates of the mouse in the window. - */ + /** + * Contains the coordinates of the mouse inside the window. + */ extern vec2 mouse; @@ -90,6 +94,7 @@ namespace ui { void toggleWhiteFast(void); void waitForCover(void); + void waitForNothing(unsigned int); } #endif // UI_H -- cgit v1.2.3