aboutsummaryrefslogtreecommitdiffstats
path: root/include/common.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h4
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.