summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--conf-tmpl/msg_athena.conf2
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/cities/amatsu.txt2
-rw-r--r--npc/cities/comodo.txt2
-rw-r--r--npc/cities/geffen.txt2
-rw-r--r--npc/cities/morocc.txt2
-rw-r--r--npc/events/event_skill_reset.txt6
-rw-r--r--npc/quests/quests_amatsu.txt2
-rw-r--r--src/char/inter.c2
-rw-r--r--src/char_sql/inter.c2
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/ladmin/ladmin.c4
-rw-r--r--src/map/atcommand.c8
-rw-r--r--src/map/charcommand.c4
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/npc_chat.c12
-rw-r--r--src/map/script.c7
18 files changed, 31 insertions, 32 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7cd3757c7..7fb41aa1d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/03/23
+ * Some generic typo fixes [ultramage]
* Corrected Ankle Snare/Spider Web having a 1% chance to trap rather than
100%
* Food boosts are now dispelled on death only.
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index 4f20f9002..08e180c10 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -364,7 +364,7 @@
351: Duel: The limit of players has been reached.
352: Duel: Player name not found.
353: Duel: The Player is in the duel already.
-354: Invitation has been sent.
+354: Duel: Invitation has been sent.
355: Duel: You can't use @duel without @reject.
356: Duel: You can take part in duel once per %d minutes.
357: Duel: Invalid value.
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cdde06ec6..1efc17be4 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -27,6 +27,7 @@ KarLaeda
Date Added
======
2007/03/23
+ * Fixed some misc typos (skill reset npc has horrible engrish btw) [ultramage]
* Reformatted TSQ for easier bug hunt [Lupus]
2007/03/22
* Retouch of Novice Grounds [Lupus]
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index cecec0704..c1dc943a0 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -14,7 +14,7 @@
//= and other fixes, thanks to Shinomori
//= 1.02 Fixed & Spell Checked [massdriller]
//= 1.03 Fixed 2 NPC names, slight optimization [Lupus]
-//= 1.04 Fixed a few typo's [Nexon]
+//= 1.04 Fixed a few typos [Nexon]
//= 1.05 Changed all breaks to ends. [Skotlex]
//= 1.06 The Captain now uses iRO dialog [MasterOfMuppets]
//= 1.07 Implemented a missing NPC [MasterOfMuppets]
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 412cebb6b..a3944fcad 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -14,7 +14,7 @@
//= Implemented the 'Cheese'/Stone of Awakening quest. Re-organized stuff. [kobra_k88]
//= 1.2b Added Baby Class support [Lupus]
//= 1.3 Spell Checked and Fixed [massdriller]
-//= 1.4 Fixed typo’s [Nexon]
+//= 1.4 Fixed typos [Nexon]
//= 1.5 Removed Duplicates [Silent]
//= 1.6 Split doomed sword quest to quests/quests_comodo.txt [Evera]
//============================================================
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index c6f91a16f..94d0cb339 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -11,7 +11,7 @@
//===== Additional Comments: =================================
//= Fully working
//= 1.1 - Spell Checked [massdriller]
-//= 1.2 Fixed more typo’s [Nexon]
+//= 1.2 Fixed more typos [Nexon]
//= 1.3 added a Level 4 weapon quest related NPC [MasterOfMuppets]
//= 1.4 Removed Duplicates [Silent]
//= 1.5 Fixed some typos and coordinates [Musashiden]
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 18395de9c..b3e85e1b7 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -14,7 +14,7 @@
//= (in both NPC/Warps) [Lupus]. Removed it from NPC and put in Warp
//= 1.3 Removed some NPC due to Assassin Job Quest [kobra_k88]
//= 1.3b mobs name corrected [Lupus], 1.3c - Adv classes support
-//= 1.4 Fixed typo’s [Nexon]
+//= 1.4 Fixed typos [Nexon]
//= 1.5 Added a lvl 4 weapon quest related NPC [MasterOfMuppets]
//= 1.6 Added Bartender NPC, made by Persian69 [Vicious_Pucca]
//= 1.7 Removed Duplicates [Silent]
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index e3d6d317d..b20224254 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -67,12 +67,12 @@ L_Info:
mes @npcname$;
mes "This skill reset is not FREE OF CHARGE!!";
mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000.";
- mes "Yeah ...each One BaseLv need 20000 Zeny to reset skill.";
+ mes "Yeah ...each One BaseLv costs 20000 Zeny to reset skill.";
next;
mes @npcname$;
mes "Oh yeah, one more thing!";
- mes "Any carts, falcon or peco's you have equiped,";
- mes "will be removed if you will reset your skills.";
+ mes "Any carts, falcons or pecos you have equiped";
+ mes "will be removed if you reset your skills.";
next;
mes @npcname$;
mes "Just one time does again to shake the skill point";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 900544d9d..5b942723d 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -386,7 +386,7 @@ ama_test,50,44,4 script Event Hall Staff 109,{
L1:
mes "[Satoshi]";
mes "Hehe...Good.";
- mes "Momotoro's Story is our";
+ mes "Momotaro's Story is our";
mes "pride. It's the best story EVER.";
mes "Hahaha!!!";
next;
diff --git a/src/char/inter.c b/src/char/inter.c
index a42202971..d500da301 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -298,7 +298,7 @@ int inter_mapif_init(int fd) {
//--------------------------------------------------------
// sended packets to map-server
-//Sends to map server the current max Account/Char id [Skotlex]
+//Sends the current max account/char id to map server [Skotlex]
void mapif_send_maxid(int account_id, int char_id)
{
unsigned char buf[12];
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index 052316e0a..3d922b85a 100644
--- a/src/char_sql/inter.c
+++ b/src/char_sql/inter.c
@@ -561,7 +561,7 @@ int mapif_send_gmaccounts()
return 0;
}
-//Sends to map server the current max Account/Char id [Skotlex]
+//Sends the current max account/char id to map server [Skotlex]
void mapif_send_maxid(int account_id, int char_id)
{
unsigned char buf[12];
diff --git a/src/common/mmo.h b/src/common/mmo.h
index b780a78c5..03c3d7484 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -20,7 +20,7 @@
#define MAX_MAP_PER_SERVER 1024
#define MAX_INVENTORY 100
-//Max number of characters per account. Note that changing this setting alone is not enough if the client is not hexed to support more chafacters as well.
+//Max number of characters per account. Note that changing this setting alone is not enough if the client is not hexed to support more characters as well.
#define MAX_CHARS 9
//Number of slots carded equipment can have. Never set to less than 4 as they are also used to keep the data of forged items/equipment. [Skotlex]
//Note: The client seems unable to receive data for more than 4 slots due to all related packets having a fixed size.
diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c
index 3f75edca8..947af1900 100644
--- a/src/ladmin/ladmin.c
+++ b/src/ladmin/ladmin.c
@@ -125,7 +125,7 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S";
//
// check <account_name> <password>
// Check the validity of a password for an account
-// NOTE: Server will never sends back a password.
+// NOTE: Server will never send back a password.
// It's the only method you have to know if a password is correct.
// The other method is to have a ('physical') access to the accounts file.
//
@@ -933,7 +933,7 @@ void display_help(char* param, int language) {
} else if (strcmp(command, "check") == 0) {
printf("check <account_name> <password>\n");
printf(" Check the validity of a password for an account.\n");
- printf(" NOTE: Server will never sends back a password.\n");
+ printf(" NOTE: Server will never send back a password.\n");
printf(" It's the only method you have to know if a password is correct.\n");
printf(" The other method is to have a ('physical') access to the accounts file.\n");
} else if (strcmp(command, "create") == 0) {
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 073503505..232b53569 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4456,7 +4456,7 @@ int atcommand_char_block(const int fd, struct map_session_data* sd, const char*
return -1;
} else {
chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 1, 0, 0, 0, 0, 0, 0); // type: 1 - block
- clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it.
+ clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it.
}
return 0;
@@ -4542,7 +4542,7 @@ int atcommand_char_ban(const int fd, struct map_session_data* sd, const char* co
return -1;
} else {
chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 2, year, month, day, hour, minute, second); // type: 2 - ban
- clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it.
+ clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it.
}
return 0;
@@ -4573,7 +4573,7 @@ int atcommand_char_unblock(const int fd, struct map_session_data* sd, const char
} else {
// send answer to login server via char-server
chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 3, 0, 0, 0, 0, 0, 0); // type: 3 - unblock
- clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it.
+ clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it.
}
return 0;
@@ -4604,7 +4604,7 @@ int atcommand_char_unban(const int fd, struct map_session_data* sd, const char*
} else {
// send answer to login server via char-server
chrif_char_ask_name(sd->status.account_id, atcmd_player_name, 4, 0, 0, 0, 0, 0, 0); // type: 4 - unban
- clif_displaymessage(fd, msg_txt(88)); // Character name sends to char-server to ask it.
+ clif_displaymessage(fd, msg_txt(88)); // Character name sent to char-server to ask it.
}
return 0;
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index 743f456f6..f531f3fc0 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -1170,7 +1170,7 @@ int charcommand_warp(
}
if (pc_setpos(pl_sd, map[m].index, x, y, 3) == 0) {
clif_displaymessage(pl_sd->fd, msg_table[0]); // Warped.
- clif_displaymessage(fd, msg_table[15]); // Player warped (message sends to player too).
+ clif_displaymessage(fd, msg_table[15]); // Player warped (message sent to player too).
return 0;
}
//No error message specified...?
@@ -1755,7 +1755,7 @@ int charcommand_changesex(
return -1;
} else {
chrif_char_ask_name(sd->status.account_id, player, 5, 0, 0, 0, 0, 0, 0); // type: 5 - changesex
- clif_displaymessage(fd, msg_table[88]); // Character name sends to char-server to ask it.
+ clif_displaymessage(fd, msg_table[88]); // Character name sent to char-server to ask it.
}
return 0;
diff --git a/src/map/clif.c b/src/map/clif.c
index 559bb4f69..457abb254 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9225,7 +9225,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd)
return;
}
- //Client doesn't sends the position for ammo.
+ //Client doesn't send the position for ammo.
if(sd->inventory_data[index]->type == IT_AMMO)
pc_equipitem(sd,index,EQP_AMMO);
else
diff --git a/src/map/npc_chat.c b/src/map/npc_chat.c
index 9cee26f8e..bd39a588c 100644
--- a/src/map/npc_chat.c
+++ b/src/map/npc_chat.c
@@ -478,9 +478,9 @@ int mob_chat_sub(struct block_list *bl, va_list ap){
// Various script builtins used to support these functions
int buildin_defpattern(struct script_state *st) {
- int setid=conv_num(st,& (st->stack->stack_data[st->start+2]));
- const char *pattern=conv_str(st,& (st->stack->stack_data[st->start+3]));
- const char *label=conv_str(st,& (st->stack->stack_data[st->start+4]));
+ int setid=conv_num(st, script_getdata(st,2));
+ const char *pattern=conv_str(st, script_getdata(st,3));
+ const char *label=conv_str(st, script_getdata(st,4));
struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid);
npc_chat_def_pattern(nd, setid, pattern, label);
@@ -489,7 +489,7 @@ int buildin_defpattern(struct script_state *st) {
}
int buildin_activatepset(struct script_state *st) {
- int setid=conv_num(st,& (st->stack->stack_data[st->start+2]));
+ int setid=conv_num(st, script_getdata(st,2));
struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid);
activate_pcreset(nd, setid);
@@ -497,7 +497,7 @@ int buildin_activatepset(struct script_state *st) {
return 0;
}
int buildin_deactivatepset(struct script_state *st) {
- int setid=conv_num(st,& (st->stack->stack_data[st->start+2]));
+ int setid=conv_num(st, script_getdata(st,2));
struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid);
deactivate_pcreset(nd, setid);
@@ -505,7 +505,7 @@ int buildin_deactivatepset(struct script_state *st) {
return 0;
}
int buildin_deletepset(struct script_state *st) {
- int setid=conv_num(st,& (st->stack->stack_data[st->start+2]));
+ int setid=conv_num(st, script_getdata(st,2));
struct npc_data *nd=(struct npc_data *)map_id2bl(st->oid);
delete_pcreset(nd, setid);
diff --git a/src/map/script.c b/src/map/script.c
index 62c88a8b9..0403cf212 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10939,11 +10939,8 @@ BUILDIN_FUNC(message)
}
/*==========================================
- * npctalk (sends message to surrounding
- * area) [Valaris]
- *------------------------------------------
- */
-
+ * npctalk (sends message to surrounding area)
+ *------------------------------------------*/
BUILDIN_FUNC(npctalk)
{
const char *str;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 18:42:55 +0000