Merge branch 'master' of https://github.com/arjo129/uSpeech

Conflicts: vocab.cpp
arjo129 · Feb 23, 2014 · fe60308 · fe60308
2 parents 82299d3 + 427ae8b
commit fe60308
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/vocab.cpp b/vocab.cpp
@@ -3,6 +3,9 @@
 syllable::syllable(){
     f = 0; e = 0; o = 0; s = 0; h = 0; v = 0;
 }
+void syllable::reset(){
+    f = 0; e = 0; o = 0; s = 0; h = 0; v = 0;
+}
 /***
  *  Classify a character into f,e,o,s,h; Call during main loop
  *  @param c    the phoneme
@@ -61,4 +64,4 @@ int* syllable::tointptr(){
     matrix[4] = h;
     matrix[5] = s;
     return matrix;
-}
+}