Merge pull request #377 from Fire-Head/master

Glass

src/core/common.h

@@ -215,6 +215,7 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 
 #define ABS(a)  (((a) < 0) ? (-(a)) : (a))
 #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
+#define lerp(norm, min, max) ( (norm) * ((max) - (min)) + (min) )
 
 #define STRINGIFY(x)                    #x
 #define STR(x)                          STRINGIFY(x)

src/core/config.h

@@ -94,6 +94,8 @@ enum Config {
 	NUM_GARAGES = 32,
 	NUM_PROJECTILES = 32,
 
+	NUM_GLASSPANES = 45,
+	NUM_GLASSENTITIES = 32,
 	NUM_WATERCANNONS = 3,
 
 	NUMPEDROUTES = 200,