summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-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
7 files changed, 13 insertions, 13 deletions
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;