Fixes for nitpicks

2 files changed, 9 insertions, 11 deletions

diff --git a/src/core/common.h b/src/core/common.h
index d3d4e049..a538ddb6 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -197,8 +197,6 @@ void re3_assert(const char *expr, const char *filename, unsigned int lineno, con
 #define ARRAY_SIZE(array)                (sizeof(array) / sizeof(array[0]))
 #define BIT(num)                         (1<<(num))
 
-//auto max = [](auto a, auto b) { return ((a) > (b)) ? (a) : (b); };
-//auto min = [](auto a, auto b) { return ((a) < (b)) ? (a) : (b); };
 #define ABS(a)  (((a) < 0) ? (-(a)) : (a))
 #define norm(value, min, max) (((value) < (min)) ? 0 : (((value) > (max)) ? 1 : (((value) - (min)) / ((max) - (min)))))
 
@@ -337,7 +335,7 @@ inline void SkipSaveBuf(uint8 *&buf, int32 skip)
 
 template<typename T>
 inline const T ReadSaveBuf(uint8 *&buf)
-{

+{
 	T &value = *(T*)buf;
 	SkipSaveBuf(buf, sizeof(T));
 	return value;
@@ -345,8 +343,8 @@ inline const T ReadSaveBuf(uint8 *&buf)
 
 template<typename T>
 inline T *WriteSaveBuf(uint8 *&buf, const T &value)
-{

-	T *p = (T*)buf;

+{
+	T *p = (T*)buf;
 	*p = value;
 	SkipSaveBuf(buf, sizeof(T));
 	return p;
@@ -355,11 +353,11 @@ inline T *WriteSaveBuf(uint8 *&buf, const T &value)
 
 #define SAVE_HEADER_SIZE (4*sizeof(char)+sizeof(uint32))
 
-#define WriteSaveHeader(buf,a,b,c,d,size) \

-	WriteSaveBuf(buf, a);\

-	WriteSaveBuf(buf, b);\

-	WriteSaveBuf(buf, c);\

-	WriteSaveBuf(buf, d);\

+#define WriteSaveHeader(buf,a,b,c,d,size) \
+	WriteSaveBuf(buf, a);\
+	WriteSaveBuf(buf, b);\
+	WriteSaveBuf(buf, c);\
+	WriteSaveBuf(buf, d);\
 	WriteSaveBuf(buf, size);
 
 #define CheckSaveHeader(buf,a,b,c,d,size)\
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 3c9556d4..8985d56a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -339,7 +339,7 @@ void
 RenderEffects(void)
 {
 	CGlass::Render();
-	CWaterCannon::Render();
+	CWaterCannons::Render();
 	CSpecialFX::Render();
 	CShadows::RenderStaticShadows();
 	CShadows::RenderStoredShadows();