summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/char/int_guild.c4
-rw-r--r--src/char/int_homun.c2
-rw-r--r--src/char/int_party.c2
-rw-r--r--src/char/int_pet.c2
-rw-r--r--src/char/int_status.c2
-rw-r--r--src/char/int_storage.c8
-rw-r--r--src/char/inter.c2
-rw-r--r--src/common/socket.c6
-rw-r--r--src/login_sql/login.c4
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/battle.h2
-rw-r--r--src/map/clif.c12
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/path.c2
-rw-r--r--src/map/pc.c4
-rw-r--r--src/map/pet.c2
-rw-r--r--src/txt-converter/char-converter.c4
17 files changed, 31 insertions, 31 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index bc17f2ff1..daa80e6d6 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -489,7 +489,7 @@ int inter_guild_save() {
int lock;
if ((fp = lock_fopen(guild_txt, &lock)) == NULL) {
- ShowError("int_guild: cant write [%s] !!! data is lost !!!\n", guild_txt);
+ ShowError("int_guild: can't write [%s] !!! data is lost !!!\n", guild_txt);
return 1;
}
guild_db->foreach(guild_db, inter_guild_save_sub, fp);
@@ -498,7 +498,7 @@ int inter_guild_save() {
// printf("int_guild: %s saved.\n", guild_txt);
if ((fp = lock_fopen(castle_txt,&lock)) == NULL) {
- ShowError("int_guild: cant write [%s] !!! data is lost !!!\n", castle_txt);
+ ShowError("int_guild: can't write [%s] !!! data is lost !!!\n", castle_txt);
return 1;
}
castle_db->foreach(castle_db, inter_castle_save_sub, fp);
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index a07378c2a..6d93a375a 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -163,7 +163,7 @@ int inter_homun_save()
FILE *fp;
int lock;
if( (fp=lock_fopen(homun_txt,&lock))==NULL ){
- ShowError("int_homun: cant write [%s] !!! data is lost !!!\n",homun_txt);
+ ShowError("int_homun: can't write [%s] !!! data is lost !!!\n",homun_txt);
return 1;
}
homun_db->foreach(homun_db,inter_homun_save_sub,fp);
diff --git a/src/char/int_party.c b/src/char/int_party.c
index ed4424d5e..8f8e22583 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -236,7 +236,7 @@ int inter_party_save() {
int lock;
if ((fp = lock_fopen(party_txt, &lock)) == NULL) {
- ShowError("int_party: cant write [%s] !!! data is lost !!!\n", party_txt);
+ ShowError("int_party: can't write [%s] !!! data is lost !!!\n", party_txt);
return 1;
}
party_db->foreach(party_db, inter_party_save_sub, fp);
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 97fef3799..81c485f18 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -134,7 +134,7 @@ int inter_pet_save()
FILE *fp;
int lock;
if( (fp=lock_fopen(pet_txt,&lock))==NULL ){
- ShowError("int_pet: cant write [%s] !!! data is lost !!!\n",pet_txt);
+ ShowError("int_pet: can't write [%s] !!! data is lost !!!\n",pet_txt);
return 1;
}
pet_db->foreach(pet_db,inter_pet_save_sub,fp);
diff --git a/src/char/int_status.c b/src/char/int_status.c
index 7ece61ccd..a0473f01a 100644
--- a/src/char/int_status.c
+++ b/src/char/int_status.c
@@ -146,7 +146,7 @@ void inter_status_save()
int lock;
if ((fp = lock_fopen(scdata_txt, &lock)) == NULL) {
- ShowError("int_status: cant write [%s] !!! data is lost !!!\n", scdata_txt);
+ ShowError("int_status: can't write [%s] !!! data is lost !!!\n", scdata_txt);
return;
}
scdata_db->foreach(scdata_db, inter_status_save_sub, fp);
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 06b05ba25..5f1f68275 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -199,7 +199,7 @@ int inter_storage_init()
fp=fopen(storage_txt,"r");
if(fp==NULL){
- ShowError("cant't read : %s\n",storage_txt);
+ ShowError("can't read : %s\n",storage_txt);
return 1;
}
while(fgets(line,65535,fp)){
@@ -227,7 +227,7 @@ int inter_storage_init()
fp=fopen(guild_storage_txt,"r");
if(fp==NULL){
- ShowError("cant't read : %s\n",guild_storage_txt);
+ ShowError("can't read : %s\n",guild_storage_txt);
return 1;
}
while(fgets(line,65535,fp)){
@@ -276,7 +276,7 @@ int inter_storage_save()
FILE *fp;
int lock;
if( (fp=lock_fopen(storage_txt,&lock))==NULL ){
- ShowError("int_storage: cant write [%s] !!! data is lost !!!\n",storage_txt);
+ ShowError("int_storage: can't write [%s] !!! data is lost !!!\n",storage_txt);
return 1;
}
storage_db->foreach(storage_db,inter_storage_save_sub,fp);
@@ -304,7 +304,7 @@ int inter_guild_storage_save()
FILE *fp;
int lock;
if( (fp=lock_fopen(guild_storage_txt,&lock))==NULL ){
- ShowError("int_storage: cant write [%s] !!! data is lost !!!\n",guild_storage_txt);
+ ShowError("int_storage: can't write [%s] !!! data is lost !!!\n",guild_storage_txt);
return 1;
}
guild_storage_db->foreach(guild_storage_db,inter_guild_storage_save_sub,fp);
diff --git a/src/char/inter.c b/src/char/inter.c
index fd46e0b33..8c5d1c641 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -156,7 +156,7 @@ int inter_accreg_save(void) {
int lock;
if ((fp = lock_fopen(accreg_txt,&lock)) == NULL) {
- ShowError("int_accreg: cant write [%s] !!! data is lost !!!\n", accreg_txt);
+ ShowError("int_accreg: can't write [%s] !!! data is lost !!!\n", accreg_txt);
return 1;
}
accreg_db->foreach(accreg_db, inter_accreg_save_sub,fp);
diff --git a/src/common/socket.c b/src/common/socket.c
index 51725a0a5..beb658144 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -670,8 +670,8 @@ int do_sendrecv(int next)
continue;
//POSTSEND: Does write EVER BLOCK? NO!! not unless WE ARE CURRENTLY SENDING SOMETHING
- //Or just have opened a connection and dont know if its ready
- //And since eA isn't multi threaded and all the sockets are non blocking THIS ISNT A PROBLEM! [Meruru]
+ //Or just have opened a connection and don't know if its ready
+ //And since eA isn't multi threaded and all the sockets are non blocking THIS ISN'T A PROBLEM! [Meruru]
if(session[i]->wdata_size && session[i]->func_send)
session[i]->func_send(i);
@@ -703,7 +703,7 @@ int do_sendrecv(int next)
}
//Does write EVER BLOCK. NO not unless WE ARE CURRENTALLY SENDING SOMETHING
- //And sence eA isnt multi threaded THIS ISNT A PROBLEM!
+ //And sence eA isnt multi threaded THIS ISN'T A PROBLEM!
if(session[i]->wdata_size && session[i]->func_send)
session[i]->func_send(i);
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 25bc9bf74..2959eb449 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1668,8 +1668,8 @@ int parse_login(int fd) {
sprintf(error,"dynamic ban (ip and account).");
break;
case 1: // 0 = Unregistered ID
- sprintf(tmpsql,tmp_sql,"Unregisterd ID.");
- sprintf(error,"Unregisterd ID.");
+ sprintf(tmpsql,tmp_sql,"Unregistered ID.");
+ sprintf(error,"Unregistered ID.");
break;
case 2: // 1 = Incorrect Password
sprintf(tmpsql,tmp_sql,"Incorrect Password.");
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 71bea1ec5..f8e2d4d17 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4250,7 +4250,7 @@ int atcommand_param(
if (strcmpi(command, param[i]) == 0)
break;
- if (param[i] == NULL || i > MAX_STATUS_TYPE) { // normaly impossible...
+ if (param[i] == NULL || i > MAX_STATUS_TYPE) { // normally impossible...
sprintf(atcmd_output, "Please, enter a valid value (usage: @str,@agi,@vit,@int,@dex,@luk <+/-adjustement>).");
clif_displaymessage(fd, atcmd_output);
return -1;
diff --git a/src/map/battle.h b/src/map/battle.h
index 4b811f069..9ae06005e 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -383,7 +383,7 @@ extern struct Battle_Config {
unsigned short berserk_cancels_buffs; // [Aru]
unsigned short debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex]
unsigned short mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex]
- unsigned short hom_setting; //Configures various homunc settings which make them behave unlike normaly characters.. [Skotlex]
+ unsigned short hom_setting; //Configures various homunc settings which make them behave unlike normal characters.. [Skotlex]
unsigned short dynamic_mobs; // Dynamic Mobs [Wizputer] - battle_athena flag implemented by [random]
unsigned short mob_remove_damaged; // Dynamic Mobs - Remove mobs even if damaged [Wizputer]
int mob_remove_delay; // Dynamic Mobs - delay before removing mobs from a map [Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c
index 30cb33bfc..aaab364d4 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8640,7 +8640,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c <
message = (unsigned char*)RFIFOP(fd,4);
if (strlen(message) < strlen(sd->status.name) || //If the incoming string is too short...
- strncmp(message, sd->status.name, strlen(sd->status.name)) != 0) //Or the name does not matches...
+ strncmp(message, sd->status.name, strlen(sd->status.name)) != 0) //Or the name does not match...
{
//Hacked message, or infamous "client desynch" issue where they pick
//one char while loading another. Just kick them out to correct it.
@@ -9129,14 +9129,14 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 <len>.w <ni
// player is on this map-server
if (dstsd->fd == fd) {
// if you send to your self, don't send anything to others
- // but, normaly, it's impossible!
+ // but, normally, it's impossible!
clif_wis_message(fd, wisp_server_name,
"You can not page yourself. Sorry.",
strlen("You can not page yourself. Sorry.") + 1);
aFree(command);
return;
}
- // otherwise, send message and answer immediatly
+ // otherwise, send message and answer immediately
if (dstsd->state.ignoreAll) {
if (dstsd->sc.option & OPTION_INVISIBLE && pc_isGM(sd) < pc_isGM(dstsd))
clif_wis_end(fd, 1); // 1: target character is not loged in
@@ -11829,7 +11829,7 @@ int clif_parse(int fd) {
dump = 1;
if ((fp = fopen(packet_txt, "a")) == NULL) {
- ShowError("clif.c: cant write [%s] !!! data is lost !!!\n", packet_txt);
+ ShowError("clif.c: can't write [%s] !!! data is lost !!!\n", packet_txt);
return 1;
} else {
time(&now);
@@ -11878,7 +11878,7 @@ int clif_parse(int fd) {
dump = 1;
if ((fp = fopen(packet_txt, "a")) == NULL) {
- ShowError("clif.c: cant write [%s] !!! data is lost !!!\n", packet_txt);
+ ShowError("clif.c: can't write [%s] !!! data is lost !!!\n", packet_txt);
return 1;
} else {
time(&now);
@@ -12304,7 +12304,7 @@ int do_init_clif(void) {
set_defaultparse(clif_parse);
if (!make_listen_bind(bind_ip,map_port)) {
- ShowFatalError("cant bind game port\n");
+ ShowFatalError("can't bind game port\n");
exit(1);
}
diff --git a/src/map/mob.c b/src/map/mob.c
index fca96c965..e3e40ea95 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -1029,7 +1029,7 @@ int mob_randomwalk(struct mob_data *md,int tick)
md->move_fail_count++;
if(md->move_fail_count>1000){
if(battle_config.error_log)
- ShowWarning("MOB cant move. random spawn %d, class = %d, at %s (%d,%d)\n",md->bl.id,md->class_,map[md->bl.m].name, md->bl.x, md->bl.y);
+ ShowWarning("MOB can't move. random spawn %d, class = %d, at %s (%d,%d)\n",md->bl.id,md->class_,map[md->bl.m].name, md->bl.x, md->bl.y);
md->move_fail_count=0;
mob_spawn(md);
}
diff --git a/src/map/path.c b/src/map/path.c
index 838d00a4a..79200a877 100644
--- a/src/map/path.c
+++ b/src/map/path.c
@@ -359,7 +359,7 @@ int path_search_real(struct walkpath_data *wpd,int m,int x0,int y0,int x1,int y1
/*
You may be thinking what about diagonal
- moves? Cant they cause a error with this some how?
+ moves? Can't they cause a error with this somehow?
Answer is NO! The only time this can cause a error
is if the target block lies on the diagonal and
is non walkable. But rember we already checked that
diff --git a/src/map/pc.c b/src/map/pc.c
index 97a2c5ca8..e20257085 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1093,7 +1093,7 @@ int pc_calc_skilltree_normalize_job(struct map_session_data *sd) {
return c; //Only Normalize non-first classes (and non-super novice)
skill_point = pc_calc_skillpoint(sd);
- if(pc_checkskill(sd, NV_BASIC) < 9) //Consider Novice Tree when you dont have NV_BASIC maxed.
+ if(pc_checkskill(sd, NV_BASIC) < 9) //Consider Novice Tree when you don't have NV_BASIC maxed.
c = MAPID_NOVICE;
else if (sd->status.skill_point >= (int)sd->status.job_level
&& ((sd->change_level > 0 && skill_point < sd->change_level+8) || skill_point < 58)) {
@@ -5057,7 +5057,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
}
}
- if(map[sd->bl.m].flag.pvp_nightmaredrop){ // Moved this outside so it works when PVP isnt enabled and during pk mode [Ancyker]
+ if(map[sd->bl.m].flag.pvp_nightmaredrop){ // Moved this outside so it works when PVP isn't enabled and during pk mode [Ancyker]
for(j=0;j<MAX_DROP_PER_MAP;j++){
int id = map[sd->bl.m].drop_list[j].drop_id;
int type = map[sd->bl.m].drop_list[j].drop_type;
diff --git a/src/map/pet.c b/src/map/pet.c
index 06ca24049..cf62696a6 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -861,7 +861,7 @@ static int pet_randomwalk(struct pet_data *pd,unsigned int tick)
pd->move_fail_count++;
if(pd->move_fail_count>1000){
if(battle_config.error_log)
- ShowWarning("PET cant move. hold position %d, class = %d\n",pd->bl.id,pd->pet.class_);
+ ShowWarning("PET can't move. hold position %d, class = %d\n",pd->bl.id,pd->pet.class_);
pd->move_fail_count=0;
pd->ud.canmove_tick = tick + 60000;
return 0;
diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c
index 6db1aceb6..b5f604bf8 100644
--- a/src/txt-converter/char-converter.c
+++ b/src/txt-converter/char-converter.c
@@ -106,7 +106,7 @@ int convert_init(void){
ShowStatus("Converting Storage Database...\n");
fp=fopen(storage_txt,"r");
if(fp==NULL){
- ShowError("cant't read : %s\n",storage_txt);
+ ShowError("can't read : %s\n",storage_txt);
return 0;
}
lineno=count=0;
@@ -243,7 +243,7 @@ int convert_init(void){
ShowStatus("Converting Guild Storage Database...\n");
fp=fopen(guild_storage_txt,"r");
if(fp==NULL){
- ShowError("cant't read : %s\n",guild_storage_txt);
+ ShowError("can't read : %s\n",guild_storage_txt);
return 0;
}
lineno=count=0;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-22 17:50:18 +0000