From f325738db0ff69176476cac7f11e0460bfdbcba4 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 7 Aug 2007 21:54:12 +0000 Subject: Some minor typo fixing. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10960 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/char/char.c | 3 +-- src/char_sql/char.c | 3 +-- src/ladmin/ladmin.c | 24 ++++++++++++------------ src/map/atcommand.c | 4 ++-- src/map/clif.c | 4 ++-- src/map/npc.c | 2 +- src/map/skill.c | 2 +- 7 files changed, 20 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/char/char.c b/src/char/char.c index dd5a63009..4ae02e360 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4139,8 +4139,7 @@ int char_config_read(const char *cfgName) } else if(strcmpi(w1,"db_path")==0) { strcpy(db_path,w2); } else if (strcmpi(w1, "console") == 0) { - if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 ) - console = 1; + console = config_switch(w2); } else if (strcmpi(w1, "fame_list_alchemist") == 0) { fame_list_size_chemist = atoi(w2); if (fame_list_size_chemist > MAX_FAME_LIST) { diff --git a/src/char_sql/char.c b/src/char_sql/char.c index fc2b11288..430f0832a 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -3917,8 +3917,7 @@ int char_config_read(const char* cfgName) } else if (strcmpi(w1, "char_del_level") == 0) { //disable/enable char deletion by its level condition [Lupus] char_del_level = atoi(w2); } else if (strcmpi(w1, "console") == 0) { - if(strcmpi(w2,"on") == 0 || strcmpi(w2,"yes") == 0 ) - console = 1; + console = config_switch(w2); } else if (strcmpi(w1, "fame_list_alchemist") == 0) { fame_list_size_chemist = atoi(w2); if (fame_list_size_chemist > MAX_FAME_LIST) { diff --git a/src/ladmin/ladmin.c b/src/ladmin/ladmin.c index 7d8815eb2..2605cb93c 100644 --- a/src/ladmin/ladmin.c +++ b/src/ladmin/ladmin.c @@ -1337,7 +1337,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement de l'année hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n"); - ladmin_log("Abnormal adjustement for the year ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the year ('banadd' command)." RETCODE); } return 137; } @@ -1347,7 +1347,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement du mois hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n"); - ladmin_log("Abnormal adjustement for the month ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the month ('banadd' command)." RETCODE); } return 137; } @@ -1357,7 +1357,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement des jours hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the days ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the days ('banadd' command)." RETCODE); } return 137; } @@ -1367,7 +1367,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement des heures hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the hours ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the hours ('banadd' command)." RETCODE); } return 137; } @@ -1377,7 +1377,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement des minutes hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the minutes ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the minutes ('banadd' command)." RETCODE); } return 137; } @@ -1387,7 +1387,7 @@ int banaddaccount(char* param) ladmin_log("Ajustement des secondes hors norme (commande 'banadd')." RETCODE); } else { ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the seconds ('banadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the seconds ('banadd' command)." RETCODE); } return 137; } @@ -2717,7 +2717,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement de l'année hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the years (from -127 to 127).\n"); - ladmin_log("Abnormal adjustement for the year ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the year ('timeadd' command)." RETCODE); } return 137; } @@ -2727,7 +2727,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement du mois hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the months (from -255 to 255).\n"); - ladmin_log("Abnormal adjustement for the month ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the month ('timeadd' command)." RETCODE); } return 137; } @@ -2737,7 +2737,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement des jours hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the days (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the days ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the days ('timeadd' command)." RETCODE); } return 137; } @@ -2747,7 +2747,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement des heures hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the hours ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the hours ('timeadd' command)." RETCODE); } return 137; } @@ -2757,7 +2757,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement des minutes hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the minutes ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the minutes ('timeadd' command)." RETCODE); } return 137; } @@ -2767,7 +2767,7 @@ int timeaddaccount(char* param) ladmin_log("Ajustement des secondes hors norme ('timeadd' command)." RETCODE); } else { ShowMessage("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); - ladmin_log("Abnormal adjustement for the seconds ('timeadd' command)." RETCODE); + ladmin_log("Abnormal adjustment for the seconds ('timeadd' command)." RETCODE); } return 137; } diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 717047709..ffa94ad0d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2594,7 +2594,7 @@ int atcommand_baselevelup(const int fd, struct map_session_data* sd, const char* level = atoi(message); if (!message || !*message || !level) { - clif_displaymessage(fd, "Please, enter a level adjustement (usage: @lvup/@blevel/@baselvlup )."); + clif_displaymessage(fd, "Please, enter a level adjustment (usage: @lvup/@blevel/@baselvlup )."); return -1; } @@ -2655,7 +2655,7 @@ int atcommand_joblevelup(const int fd, struct map_session_data* sd, const char* level = atoi(message); if (!message || !*message || !level) { - clif_displaymessage(fd, "Please, enter a level adjustement (usage: @joblvup/@jlevel/@joblvlup )."); + clif_displaymessage(fd, "Please, enter a level adjustment (usage: @joblvup/@jlevel/@joblvlup )."); return -1; } if (level > 0) { diff --git a/src/map/clif.c b/src/map/clif.c index 6e96d79a4..6ab8ea438 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3766,7 +3766,7 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl) if (pd->vd.head_bottom) { //TODO: adjust clif_pet_equip() to support a 'target', then rewrite this mess into a function call - int fd = sd->fd; + int fd = sd->fd; WFIFOHEAD(fd,packet_len(0x1a4)); WFIFOW(fd,0) = 0x1a4; WFIFOB(fd,2) = 3; @@ -7482,7 +7482,7 @@ int clif_refresh(struct map_session_data *sd) nullpo_retr(-1, sd); clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y); clif_inventorylist(sd); - if(pc_iscarton(sd)){ + if(pc_iscarton(sd)) { clif_cartlist(sd); clif_updatestatus(sd,SP_CARTINFO); } diff --git a/src/map/npc.c b/src/map/npc.c index 2afd9421b..8c3a2f78e 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2580,7 +2580,7 @@ static int npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4) } else if (strcmpi(w3,"gvg")==0) { map[m].flag.gvg=state; - if (state && map[m].flag.pvp) + if (state && map[m].flag.pvp) { map[m].flag.pvp=0; ShowWarning("You can't set PvP and GvG flags for the same map! Removing PvP flag from %s\n", map[m].name); diff --git a/src/map/skill.c b/src/map/skill.c index 5e76f581f..dee052c43 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4664,7 +4664,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in switch (i) { case SC_WEIGHT50: case SC_WEIGHT90: case SC_HALLUCINATION: case SC_STRIPWEAPON: case SC_STRIPSHIELD: case SC_STRIPARMOR: - case SC_STRIPHELM: case SC_CP_WEAPON: case SC_CP_SHIELD: + case SC_STRIPHELM: case SC_CP_WEAPON: case SC_CP_SHIELD: case SC_CP_ARMOR: case SC_CP_HELM: case SC_COMBO: case SC_STRFOOD: case SC_AGIFOOD: case SC_VITFOOD: case SC_INTFOOD: case SC_DEXFOOD: case SC_LUKFOOD: -- cgit v1.2.3-70-g09d2