diff options
author | Mysteries <mysteriousragnarok@hotmail.com> | 2014-12-14 22:29:56 -0500 |
---|---|---|
committer | Mysteries <mysteriousragnarok@hotmail.com> | 2014-12-14 22:29:56 -0500 |
commit | c7df86cc2442c29649ae44b629b05818a1742c08 (patch) | |
tree | 9da0b2c0b999b4f572fc8eec0f61d54593afb740 | |
parent | c0169f29abd37dcc8c29510343755c5034a0751a (diff) | |
download | hercules-c7df86cc2442c29649ae44b629b05818a1742c08.tar.gz hercules-c7df86cc2442c29649ae44b629b05818a1742c08.tar.bz2 hercules-c7df86cc2442c29649ae44b629b05818a1742c08.tar.xz hercules-c7df86cc2442c29649ae44b629b05818a1742c08.zip |
Fixed some improper grammar.
-rw-r--r-- | 3rdparty/libconfig/grammar.c | 2 | ||||
-rw-r--r-- | db/pre-re/map_zone_db.conf | 2 | ||||
-rw-r--r-- | db/re/map_zone_db.conf | 2 | ||||
-rw-r--r-- | npc/custom/etc/quest_warper.txt | 2 | ||||
-rw-r--r-- | src/common/HPM.c | 2 | ||||
-rw-r--r-- | src/map/clif.c | 2 | ||||
-rw-r--r-- | src/map/map.c | 2 | ||||
-rw-r--r-- | src/map/pc.c | 6 | ||||
-rw-r--r-- | src/map/status.c | 8 |
9 files changed, 14 insertions, 14 deletions
diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c index 26444f816..55216535b 100644 --- a/3rdparty/libconfig/grammar.c +++ b/3rdparty/libconfig/grammar.c @@ -1261,7 +1261,7 @@ YYSTYPE yylval; `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yy overflow to reallocate them elsewhere. */ /* The state stack. */ diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf index 326921a48..558a168ce 100644 --- a/db/pre-re/map_zone_db.conf +++ b/db/pre-re/map_zone_db.conf @@ -59,7 +59,7 @@ zones: ( }, { /* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */ - /* However, it wont be applied to maps with its own zones (specified thru mapflag) */ + /* However, it wont be applied to maps with its own zones (specified through mapflag) */ name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */ disabled_skills: { diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf index b9723a99b..71616c4d4 100644 --- a/db/re/map_zone_db.conf +++ b/db/re/map_zone_db.conf @@ -59,7 +59,7 @@ zones: ( }, { /* Normal zone is applied to all maps that are not pkable (where players cant fight each other) */ - /* However, it wont be applied to maps with its own zones (specified thru mapflag) */ + /* However, it wont be applied to maps with its own zones (specified through mapflag) */ name: "Normal" /* changing this name requires MAP_ZONE_NORMAL_NAME to also be changed in src/map/map.h file */ disabled_skills: { diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index b9bfcf74f..3526cde5c 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -55,7 +55,7 @@ // - when all towns and dungeons are collected a new option on the main menu will show // - it will only show when you setup the mapname of the warp ! //= 2.0a - Dungeon Level Limit & Split dungeon fees -// - Limits dungeon based on Depth, access special setup menu thru GM-Menu +// - Limits dungeon based on Depth, access to special setup menu through the GM-Menu // - Dungeon fees split up based on Basic , Advanced & Overseas // - Old Dungeon fee system removed, all dungeon fees now set to 0 //= 2.0b - Special warpname menu option name bug fixed diff --git a/src/common/HPM.c b/src/common/HPM.c index e38451161..51a595310 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -273,7 +273,7 @@ void hplugin_unload(struct hplugin* plugin) { if( plugin->dll ) plugin_close(plugin->dll); /* TODO: for manual packet unload */ - /* - Go thru known packets and unlink any belonging to the plugin being removed */ + /* - Go through known packets and unlink any belonging to the plugin being removed */ aFree(plugin); if( !HPM->off ) { HPM->plugins[i] = NULL; diff --git a/src/map/clif.c b/src/map/clif.c index 5194a637a..173175260 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -11450,7 +11450,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd) if( skill_lv != sd->skillitemlv ) skill_lv = sd->skillitemlv; if( !(tmp&INF_SELF_SKILL) ) - pc->delinvincibletimer(sd); // Target skills thru items cancel invincibility. [Inkfish] + pc->delinvincibletimer(sd); // Target skills through items cancel invincibility. [Inkfish] unit->skilluse_id(&sd->bl, target_id, skill_id, skill_lv); return; } diff --git a/src/map/map.c b/src/map/map.c index 2c1495f32..010df6286 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5484,7 +5484,7 @@ void map_helpscreen(bool do_exit) ShowInfo(" scripts passed through --load-script.\n"); ShowInfo(" --load-script <file> Loads an additional script (can be repeated).\n"); ShowInfo(" --load-plugin <name> Loads an additional plugin (can be repeated).\n"); - HPM->arg_help();/* display help for commands implemented thru HPM */ + HPM->arg_help(); /* display help for commands implemented through HPM */ if( do_exit ) exit(EXIT_SUCCESS); } diff --git a/src/map/pc.c b/src/map/pc.c index b22c0d74e..5c6cac6e9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6990,7 +6990,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) { sd->st->state = END; } - /* e.g. not killed thru pc->damage */ + /* e.g. not killed through pc->damage */ if( pc_issit(sd) ) { clif->sc_end(&sd->bl,sd->bl.id,SELF,SI_SIT); } @@ -10587,8 +10587,8 @@ int pc_expiration_timer(int tid, int64 tick, int id, intptr_t data) { return 0; } -/* this timer exists only when a character with a expire timer > 24h is online */ -/* it loops thru online players once an hour to check whether a new < 24h is available */ +/* This timer exists only when a character with an expire timer > 24h is online */ +/* It loops through online players once an hour to check whether a new < 24h is available */ int pc_global_expiration_timer(int tid, int64 tick, int id, intptr_t data) { struct s_mapiterator* iter; struct map_session_data* sd; diff --git a/src/map/status.c b/src/map/status.c index 6d4b8d5fa..54b4a4358 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1138,7 +1138,7 @@ int status_damage(struct block_list *src,struct block_list *target,int64 in_hp, struct status_change *sc; int hp,sp; - /* here onwards we consider it a 32-type, the client does not support higher and from here onwards the value doesn't get thru percentage modifiers */ + /* From here onwards, we consider it a 32-type as the client does not support higher and the value doesn't get through percentage modifiers */ hp = (int)cap_value(in_hp,INT_MIN,INT_MAX); sp = (int)cap_value(in_sp,INT_MIN,INT_MAX); @@ -1371,7 +1371,7 @@ int status_heal(struct block_list *bl,int64 in_hp,int64 in_sp, int flag) { if (st == &status->dummy || !st->hp) return 0; - /* here onwards we consider it a 32-type, the client does not support higher and from here onwards the value doesn't get thru percentage modifiers */ + /* From here onwards, we consider it a 32-type as the client does not support higher and the value doesn't get through percentage modifiers */ hp = (int)cap_value(in_hp,INT_MIN,INT_MAX); sp = (int)cap_value(in_sp,INT_MIN,INT_MAX); @@ -6959,7 +6959,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t return 0; //Overthrust can't take effect if under Max Overthrust. [Skotlex] case SC_OVERTHRUSTMAX: if( sc->option&OPTION_MADOGEAR ) - return 0;//Overthrust and Overthrust Max cannot be used on Mado Gear [Ind] + return 0; //Overthrust and Overthrust Max cannot be used on Mado Gear [Ind] break; case SC_ADRENALINE: if(sd && !pc_check_weapontype(sd,skill->get_weapontype(BS_ADRENALINE))) @@ -6995,7 +6995,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t case SC_CARTBOOST: case SC_ASSNCROS: if(sc->option&OPTION_MADOGEAR) - return 0;//Mado is immune to wind walk, cart boost, etc (others above) [Ind] + return 0; //Mado is immune to wind walk, cart boost, etc (others above) [Ind] case SC_INC_AGI: if (sc->data[SC_QUAGMIRE]) return 0; |