Fixed after years of neglect

2 files changed, 13 insertions, 9 deletions

diff --git a/src/a.out b/src/a.out
new file mode 100755
index 0000000..dfbc13a
--- /dev/null
+++ b/src/a.out
diff --git a/src/loveletter.cpp b/src/loveletter.cpp
index cb2f42a..fab0b93 100644
--- a/src/loveletter.cpp
+++ b/src/loveletter.cpp
@@ -5,10 +5,12 @@
 
 using namespace std;
 
-string word(string type[]) {
+template<size_t N>
+
+string word(string (&type)[N]) {
     string word;
     
-    word = type[rand() % size(type)];
+    word = type[rand() % N];
     
     return word;
 }
@@ -20,19 +22,22 @@ int main() {
     
     string g2[] = {"FELLOW FEELING", "FANCY", "JEWEL", "DOLL", "LOVE", "AMOUR", "BELOVED", "HONEY"};
 
-    string noun[] = {"SWEETHEART", "LOVE", "HEART", "PARAMOUR", "BEAU", "AMOUR", "FELLOW FEELING", "SYMPATHY", "WISH", "FLAME", "BELOVED", "TRUELOVE", "WONDER", "GEM", "DREAM", "PEACH", "SUGAR", "DAISY", "TREASURE", "DOOZY", "BEAUTY", "ADORATION", "AFFECTION", "DEVOTION", "RAPTURE", "FERVOUR", "WARMTH", "ARDOR", "CHARM", "FLAME", "FELICITY", "FANCY", "BEING"};
+    string noun[] = {"SWEETHEART", "LOVE", "HEART", "PARAMOUR", "BEAU", "AMOUR", "FELLOW FEELING", "SYMPATHY", "WISH", "FLAME", "BELOVED", "TRUELOVE", "WONDER", "GEM", "DREAM", "PEACH",
+	    "SUGAR", "DAISY", "TREASURE", "DOOZY", "BEAUTY", "ADORATION", "AFFECTION", "DEVOTION", "RAPTURE", "FERVOUR", "WARMTH", "ARDOR", "CHARM", "FLAME", "FELICITY", "FANCY", "BEING"};
 
-    string adj[] = {"SWEET", "LOVELY", "AVID", "WISTFUL", "PASSIONATE", "ADORABLE", "BEAUTIFUL", "AFFECTIONATE", "FOND", "TENDER", "DEVOTED", "ADORING", "KIND", "FERVENT", "CORDIAL", "ENAMORED", "BELOVED", "PRECIOUS", "CHERISHED", "FAVOURITE", "FAIR", "ESTEEMED", "REVERED", "RELISHED", "ENCHANTING", "PLEASANT", "GRACEFUL", "TRUE", "DREAMY", "BURNING"};
+    string adj[] = {"SWEET", "LOVELY", "AVID", "WISTFUL", "PASSIONATE", "ADORABLE", "BEAUTIFUL", "AFFECTIONATE", "FOND", "TENDER", "DEVOTED", "ADORING", "KIND", "FERVENT", "CORDIAL",
+	    "ENAMORED", "BELOVED", "PRECIOUS", "CHERISHED", "FAVOURITE", "FAIR", "ESTEEMED", "REVERED", "RELISHED", "ENCHANTING", "PLEASANT", "GRACEFUL", "TRUE", "DREAMY", "BURNING"};
 
     string adv[] = {"TENDERLY", "BEAUTIFULLY", "CURIOUSLY", "LOYALLY", "TRULY", "WARMLY", "EAGERLY", "LOVINGLY", "AVIDLY", "KEENLY", "MARVELOUSLY", "ENTICINGLY", "CHARMINGLY", "DREAMILY"};
 
-    string verb[] = {"LONGS FOR", "YEARNS FOR", "CLINGS TO", "HOLDS DEAR", "TREASURES", "LIKES", "HUNGERS FOR", "ADORES", "THIRSTS FOR", "DESIRES", "SEEKS", "WISHES FOR", "STRIVES FOR", "PINES FOR", "WISHES FOR", "SIGHS FOR"};
+    string verb[] = {"LONGS FOR", "YEARNS FOR", "CLINGS TO", "HOLDS DEAR", "TREASURES", "LIKES", "HUNGERS FOR", "ADORES", "THIRSTS FOR", "DESIRES", "SEEKS", "WISHES FOR", "STRIVES FOR",
+	    "PINES FOR", "WISHES FOR", "SIGHS FOR"};
 
     cout << word(g1) << " " << word(g2) << "," << endl << endl; //greeting
 
     for(int i = 0; i < 5; i++) {
-        if(rand()%2 == 0) {
-            if(rand()%2 == 0) {
+        if(rand() % 2 == 0) {
+            if(rand() % 2 == 0) {
                 cout << "YOU ARE MY " << word(adj) << " " << word(noun) << ". "; //short
             }
 
@@ -42,8 +47,7 @@ int main() {
         }
 
         else {
-            cout << "MY " << word(adj) << " " << word(noun) << " " << word(adv)
-            << " " << word(verb) << " YOUR " << word(adj) << " " << word(noun) << ". "; //long
+            cout << "MY " << word(adj) << " " << word(noun) << " " << word(adv) << " " << word(verb) << " YOUR " << word(adj) << " " << word(noun) << ". "; //long
         }
     }