--- deliantra/server/server/attack.c 2006/05/11 18:42:29 1.13 +++ deliantra/server/server/attack.c 2006/05/12 11:33:36 1.14 @@ -405,7 +405,7 @@ || attack_mess[ATM_SUFFER][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_SUFFER][i].buf1, op->name, attack_mess[ATM_SUFFER][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_SUFFER][i].buf3); + strcpy (buf2, attack_mess[ATM_SUFFER][i].buf3); found++; break; } @@ -416,7 +416,7 @@ || attack_mess[ATM_DOOR][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_DOOR][i].buf1, op->name, attack_mess[ATM_DOOR][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_DOOR][i].buf3); + strcpy (buf2, attack_mess[ATM_DOOR][i].buf3); found++; break; } @@ -428,7 +428,7 @@ || attack_mess[ATM_KARATE][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_KARATE][i].buf1, op->name, attack_mess[ATM_KARATE][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_KARATE][i].buf3); + strcpy (buf2, attack_mess[ATM_KARATE][i].buf3); found++; break; } @@ -439,7 +439,7 @@ || attack_mess[ATM_CLAW][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_CLAW][i].buf1, op->name, attack_mess[ATM_CLAW][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_CLAW][i].buf3); + strcpy (buf2, attack_mess[ATM_CLAW][i].buf3); found++; break; } @@ -450,7 +450,7 @@ || attack_mess[ATM_PUNCH][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_PUNCH][i].buf1, op->name, attack_mess[ATM_PUNCH][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_PUNCH][i].buf3); + strcpy (buf2, attack_mess[ATM_PUNCH][i].buf3); found++; break; } @@ -463,7 +463,7 @@ for (i=0; i < MAXATTACKMESS; i++) if (dam < attack_mess[ATM_ARROW][i].level || attack_mess[ATM_ARROW][i+1].level == -1) { - sprintf(buf2, "%s", attack_mess[ATM_ARROW][i].buf3); + strcpy (buf2, attack_mess[ATM_ARROW][i].buf3); found++; break; } @@ -475,7 +475,7 @@ || attack_mess[ATM_DRAIN][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_DRAIN][i].buf1, op->name, attack_mess[ATM_DRAIN][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_DRAIN][i].buf3); + strcpy (buf2, attack_mess[ATM_DRAIN][i].buf3); found++; break; } @@ -486,7 +486,7 @@ || attack_mess[ATM_ELEC][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_ELEC][i].buf1, op->name, attack_mess[ATM_ELEC][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_ELEC][i].buf3); + strcpy (buf2, attack_mess[ATM_ELEC][i].buf3); found++; break; } @@ -497,7 +497,7 @@ || attack_mess[ATM_COLD][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_COLD][i].buf1, op->name, attack_mess[ATM_COLD][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_COLD][i].buf3); + strcpy (buf2, attack_mess[ATM_COLD][i].buf3); found++; break; } @@ -508,7 +508,7 @@ || attack_mess[ATM_FIRE][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_FIRE][i].buf1, op->name, attack_mess[ATM_FIRE][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_FIRE][i].buf3); + strcpy (buf2, attack_mess[ATM_FIRE][i].buf3); found++; break; } @@ -532,7 +532,7 @@ || attack_mess[mtype][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[mtype][i].buf1, op->name, attack_mess[mtype][i].buf2); - sprintf(buf2, "%s", attack_mess[mtype][i].buf3); + strcpy (buf2, attack_mess[mtype][i].buf3); found++; break; } @@ -543,15 +543,15 @@ || attack_mess[ATM_BASIC][i+1].level == -1) { sprintf(buf1, "%s %s%s", attack_mess[ATM_BASIC][i].buf1, op->name, attack_mess[ATM_BASIC][i].buf2); - sprintf(buf2, "%s", attack_mess[ATM_BASIC][i].buf3); + strcpy (buf2, attack_mess[ATM_BASIC][i].buf3); found++; break; } } if (!found) { - sprintf(buf1, "hit"); - sprintf(buf2, "hits"); + strcpy (buf1, "hit"); + strcpy (buf2, " hits"); } /* bail out if a monster is casting spells */ @@ -567,7 +567,7 @@ if(op->type==PLAYER && (get_owner(hitter)==NULL?hitter->type:hitter->owner->type)==PLAYER) { if(get_owner(hitter)!=NULL) - sprintf(buf,"%s's %s %s you.", + sprintf(buf,"%s's %s%s you.", hitter->owner->name, hitter->name, buf2); else { sprintf(buf,"%s%s you.",hitter->name, buf2);