diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-02 08:46:58 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-02-02 08:46:58 -0500 |
| commit | 783143974e36856e92be3fe1b13cc6a0d0b1faeb (patch) | |
| tree | 4a6e0b56120874845027e96901c0eb89c106a64d /include/common.h | |
| parent | ed970399ee3865ac7c5682d8a81a6a8a2282dd4a (diff) | |
Better menus and config writing
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index d0f539b..9f19134 100644 --- a/include/common.h +++ b/include/common.h @@ -80,7 +80,7 @@ struct col{ red-=a; green-=a; blue-=a; - return *this; + return{red+a,green+a,blue+a}; } col operator+=(float a){ return{red+a,green+a,blue+a}; @@ -130,6 +130,8 @@ extern bool FULLSCREEN; //#define HLINE 3 extern unsigned int HLINE; +extern float VOLUME_MASTER; +extern float VOLUME_MUSIC; /** * A 'wrapper' for libc's srand(), as we hope to eventually have our own random number * generator. |