Fixed bug # 998029 causing a crash on gentoo systems due to a mistake in code:

[irc/gameservirc.git] / gameserv / gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 3f0741c0abe9df1d0b2c8cffb8035b31e924519c..d1b50f7ab84013cf67b543fb66c3947aac7502ad 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -2602,7 +2602,7 @@ void do_tavern(char *u)
                    notice(s_GameServ, u, "You don't have enough gold!");
                break;
            case 4:
-               price = 3000 * p->level * 4;
+               price = 2000 * p->level * 4;
                if (p->gold >= price)
                {
                    notice(s_GameServ, u, "One HP Potion coming right up!");
@@ -2844,7 +2844,7 @@ void do_dragon(char *u)
     notice(s_GameServ, u, "You adjust your %s, tighten your grip on "\
        "your %s, and venture into the hot, dark cave. "\
        "You are surprised at the angle of descent as you climb "\
-       "lower and lower, deeper into the dragon's den.");
+       "lower and lower, deeper into the dragon's den.", armors[p->level - 1], weapons[p->level - 1]);
     notice(s_GameServ, u, "You come to the end of the cave to find "\
        "a tooth. It is a large tooth... bigger than your torso."\
        " Suddenly the darkness lifts from the gleam of an eye "\
@@ -3467,11 +3467,6 @@ bool load_monsters()
 
             strcpy(temp->name, strtok(buf, "~"));
             strcpy(temp->weapon, strtok(NULL, "~"));
-            temp->strength = stringtoint(strtok(NULL, "~"));
-            temp->gold = stringtoint(strtok(NULL, "~"));
-            temp->exp = stringtoint(strtok(NULL, "~"));
-            temp->maxhp = stringtoint(strtok(NULL, "~"));
-            temp->hp = temp->maxhp;
             strcpy(temp->death, strtok(NULL, "~"));
 
        levels[level - 1].monsters.insertAtBack_RLN(temp);