Hugging angers monsters that don't like you enough. Fix some bugs that were preventin...

[rogue-pphs.git] / rip.c

diff --git a/rip.c b/rip.c
index 1e2250d..e7c8edb 100644 (file)
--- a/rip.c
+++ b/rip.c
@@ -38,8 +38,6 @@ static char *rip[] = {
     0\r
 };\r
 \r
-char   *killname();\r
-\r
 /*\r
  * death:\r
  *     Do something really fun when he dies\r
@@ -103,7 +101,7 @@ char monst;
        "killed",\r
        "quit",\r
        "A total loner",\r
-       "left for a date",\r
+       "left for a cuddle",\r
        "got the amulet and left"\r
     };\r
     char scoreline[100];\r
@@ -118,7 +116,7 @@ char monst;
     strcpy(score_file, md_getroguedir());\r
 \r
     if (*score_file)\r
-        strcat(score_file,"\\");\r
+        strcat(score_file,"/");\r
 \r
     strcat(score_file, "rogue36.scr");\r
 \r
@@ -211,6 +209,15 @@ char monst;
                        putchar('n');\r
                printf(" %s", killer);\r
            }\r
+           else if (scp->sc_flags >= 3)\r
+           {\r
+                printf(" with a");\r
+               killer = killname(scp->sc_monster);\r
+               if (*killer == 'a' || *killer == 'e' || *killer == 'i' ||\r
+                   *killer == 'o' || *killer == 'u')\r
+                       putchar('n');\r
+               printf(" %s", killer);\r
+            }\r
            if (prflags == 1)\r
            {\r
                printf(" (%s)", scp->sc_login);\r
@@ -233,15 +240,6 @@ char monst;
                    scp--;\r
                }\r
            }\r
-           else if (prflags >= 3)\r
-           {\r
-                printf(" with a");\r
-               killer = killname(scp->sc_monster);\r
-               if (*killer == 'a' || *killer == 'e' || *killer == 'i' ||\r
-                   *killer == 'o' || *killer == 'u')\r
-                       putchar('n');\r
-               printf(" %s", killer);\r
-            }\r
            else\r
                printf(".\n");\r
        }\r
@@ -268,10 +266,9 @@ total_loner(monster)
 char monster;\r
 {\r
     clear();\r
-    standout();\r
     addstr("                                                               \n");\r
     addstr("           You escaped from the caverns, but alone.            \n");\r
-    standend();\r
+    addstr("                                                               \n");\r
     addstr("\nYou have joined the elite ranks of those who have escaped the\n");\r
     addstr("Cavern of Cuties alive, but failed to meet anyone while there.\n");\r
     addstr("You journey home and sell all your loot at a great profit and\n");\r
@@ -283,10 +280,11 @@ total_winner(monster)
 char monster;\r
 {\r
     clear();\r
-    standout();\r
     addstr("                                                               \n");\r
     addstr("             You got the amulet and a hot date.                \n");\r
-    standend();\r
+    addstr("                                                               \n");\r
+    addstr("                          @ <3 ");\r
+    addch(monster);\r
     total_something(4, monster);\r
 }\r
 \r
@@ -294,10 +292,11 @@ mostly_winner(monster)
 char monster;\r
 {\r
     clear();\r
-    standout();\r
     addstr("                                                               \n");\r
     addstr("                      You got a hot date.                      \n");\r
-    standend();\r
+    addstr("                                                               \n");\r
+    addstr("                             @ <3 ");\r
+    addch(monster);\r
     total_something(3, monster);\r
 }\r
 \r
@@ -313,7 +312,7 @@ char monster;
 \r
     mvaddstr(LINES - 1, 0, "--Press space to continue--");\r
     refresh();\r
-    wait_for(' ');\r
+    wait_for(cw, ' ');\r
     clear();\r
     mvaddstr(0, 0, "   Worth  Item");\r
     oldpurse = purse;\r