clippin

3 files changed, 13 insertions, 4 deletions

diff --git a/Table.cpp b/Table.cpp
index 25eb253..dc731a8 100644
--- a/Table.cpp
+++ b/Table.cpp
@@ -1,13 +1,12 @@
 #include "Table.hpp"
 #include "Cursor.hpp"
 #include "cfg.hpp"
+#include "util.hpp"
 #include "lzr.h"
 #include <stdlib.h>
 
-Table::Table() : _notes(), _edited(-1)
+Table::Table() : _notes(), _strength(), _edited(-1)
 {
-	for (int i = 0; i < _width; i++)
-		_strength[i] = 1;
 }
 
 void Table::update(const Cursor& cursor)
@@ -23,7 +22,7 @@ void Table::update(const Cursor& cursor)
 			_strength[x] += 1;
 		else
 			_strength[x] = 1;
-		_notes[x] = cursor.y;
+		_notes[x] = util::min(CFG_DHEIGHT - 1, util::max(0, cursor.y));
 		_edited = x;
 	} else if (cursor.erase) {
 		_strength[x] = 0;
diff --git a/util.cpp b/util.cpp
new file mode 100644
index 0000000..2abdef3
--- /dev/null
+++ b/util.cpp
@@ -0,0 +1,4 @@
+#include "util.hpp"
+
+int util::min(int a, int b) { return (a < b) ? a : b; }
+int util::max(int a, int b) { return (a > b) ? a : b; }
diff --git a/util.hpp b/util.hpp
new file mode 100644
index 0000000..6835f8f
--- /dev/null
+++ b/util.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace util {
+	int min(int a, int b);
+	int max(int a, int b);
+}