summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-29 09:01:36 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-29 09:01:36 +0000
commit0fa0cec38f5739d11dff696ca74f1486884061e2 (patch)
tree07ca894720e023ff64baf03d06f6f89b638c138f /src
parent93c52deb53c4a163e69aeed5fb2af4dba66842c2 (diff)
downloadhercules-0fa0cec38f5739d11dff696ca74f1486884061e2.tar.gz
hercules-0fa0cec38f5739d11dff696ca74f1486884061e2.tar.bz2
hercules-0fa0cec38f5739d11dff696ca74f1486884061e2.tar.xz
hercules-0fa0cec38f5739d11dff696ca74f1486884061e2.zip
- Some small bug fixes discovered while merging.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7961 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/mob.c4
-rw-r--r--src/map/status.c9
-rw-r--r--src/map/unit.c2
4 files changed, 9 insertions, 8 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 707cb139b..4c3edf5c1 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3424,7 +3424,7 @@ static const struct battle_data_short {
{ "warp_point_debug", &battle_config.warp_point_debug },
{ "enemy_critical_rate", &battle_config.enemy_critical_rate },
{ "homun_critical_rate", &battle_config.homun_critical_rate },
- { "enemy_baseatk", &battle_config.enable_baseatk },
+ { "enable_baseatk", &battle_config.enable_baseatk },
{ "enable_perfect_flee", &battle_config.enable_perfect_flee },
{ "casting_rate", &battle_config.cast_rate },
{ "delay_rate", &battle_config.delay_rate },
diff --git a/src/map/mob.c b/src/map/mob.c
index 7eed36758..6a72df011 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3894,12 +3894,12 @@ static int mob_read_sqldb(void)
status->ele_lv = i/20;
if (status->def_ele >= ELE_MAX)
{
- ShowWarning("Mob with ID: %d has invalid element type %d (max element is %d)\n", status->def_ele, ELE_MAX-1);
+ ShowWarning("Mob with ID: %d has invalid element type %d (max element is %d)\n", class_, status->def_ele, ELE_MAX-1);
status->def_ele = ELE_NEUTRAL;
}
if (status->ele_lv < 1 || status->ele_lv > 4)
{
- ShowWarning("Mob with ID: %d has invalid elemnt level %d (max is 4)\n", status->ele_lv);
+ ShowWarning("Mob with ID: %d has invalid elemnt level %d (max is 4)\n", class_, status->ele_lv);
status->ele_lv = 1;
}
status->mode = TO_INT(25);
diff --git a/src/map/status.c b/src/map/status.c
index 91141855a..ada20d59e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1439,7 +1439,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
struct status_data b_status, *status;
struct weapon_atk b_lhw;
struct skill b_skill[MAX_SKILL];
-
+
int b_weight,b_max_weight;
int i,index;
int skill,refinedef=0;
@@ -1538,7 +1538,8 @@ int status_calc_pc(struct map_session_data* sd,int first)
if (sd->class_&JOBL_BABY) {
if (battle_config.character_size&2)
status->size++;
- } if(battle_config.character_size&1)
+ } else
+ if(battle_config.character_size&1)
status->size++;
}
status->aspd_rate = 1000;
@@ -1677,7 +1678,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
{ // Forged weapon
wd->star += (sd->status.inventory[index].card[1]>>8);
if(wd->star >= 15) wd->star = 40; // 3 Star Crumbs now give +40 dmg
- if(pc_famerank( MakeDWord(sd->status.inventory[index].card[2],sd->status.inventory[index].card[3]) ,MAPID_BLACKSMITH))
+ if(pc_famerank(MakeDWord(sd->status.inventory[index].card[2],sd->status.inventory[index].card[3]) ,MAPID_BLACKSMITH))
wd->star += 10;
if (!wa->ele) //Do not overwrite element from previous bonuses.
@@ -1694,7 +1695,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
}
}
- if(sd->equip_index[EQI_AMMO] >= 0){ // –î
+ if(sd->equip_index[EQI_AMMO] >= 0){
index = sd->equip_index[EQI_AMMO];
if(sd->inventory_data[index]){ // Arrows
sd->state.lr_flag = 2;
diff --git a/src/map/unit.c b/src/map/unit.c
index ddd9fac3c..2edc69e47 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -806,7 +806,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
sd->skilllv_old = ud->skilllv;
break;
}
- case BD_ENCORE:
+ case BD_ENCORE:
//Prevent using the dance skill if you no longer have the skill in your tree.
if(!sd->skillid_dance || pc_checkskill(sd,sd->skillid_dance)<=0){
clif_skill_fail(sd,skill_num,0,0);