summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bcc43d65e..8dae57d4d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -2,6 +2,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/08/04
+ * Fixed warning:'type' might be used uninitialized in this function [Toms]
2006/08/03
* Added a check to skip the experience share of characters who are dead or
on another map. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index cbc017819..2bf410ca3 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -656,7 +656,7 @@ int battle_addmastery(struct map_session_data *sd,struct block_list *target,int
static int battle_calc_base_damage(struct status_data *status, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag)
{
unsigned short atkmin=0, atkmax=0;
- short type;
+ short type = 0;
int damage = 0;
if (!sd)