summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-01 05:30:12 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-01 05:30:12 +0000
commit9a2364406f6786bb96f13f7509c825e93e074ea9 (patch)
tree77d76a7e3d916ca46c64dc5ec5011118081da47f /src/map
parent1a5669daa2c667e78be2d2b9e2145b6335a7ceaf (diff)
downloadhercules-9a2364406f6786bb96f13f7509c825e93e074ea9.tar.gz
hercules-9a2364406f6786bb96f13f7509c825e93e074ea9.tar.bz2
hercules-9a2364406f6786bb96f13f7509c825e93e074ea9.tar.xz
hercules-9a2364406f6786bb96f13f7509c825e93e074ea9.zip
* Fixed compiler warnings.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5838 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c8
-rw-r--r--src/map/irc.c2
-rw-r--r--src/map/pet.c2
-rw-r--r--src/map/script.c1
4 files changed, 6 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 43a8ebb0d..8705b30bf 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -813,7 +813,7 @@ void clif_get_weapon_view(TBL_PC* sd, short *rhand, short *lhand)
#endif
}
-static void clif_get_guild_data(struct block_list *bl, long *guild_id, long *emblem_id)
+static void clif_get_guild_data(struct block_list *bl, long *guild_id, short *emblem_id)
{
//TODO: There has to be a way to clean this up.
switch (bl->type) {
@@ -848,7 +848,8 @@ static void clif_get_guild_data(struct block_list *bl, long *guild_id, long *emb
static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned char *buf) {
struct status_change *sc;
struct map_session_data *sd;
- long guild_id=0, emblem_id=0, lv;
+ long guild_id=0;
+ unsigned short emblem_id=0, lv;
unsigned short dir;
nullpo_retr(0, bl);
@@ -969,7 +970,8 @@ static int clif_set0078(struct block_list *bl, struct view_data *vd, unsigned ch
static int clif_set007b(struct block_list *bl, struct view_data *vd, struct unit_data *ud, unsigned char *buf) {
struct status_change *sc;
struct map_session_data *sd;
- long guild_id=0, emblem_id=0, lv;
+ long guild_id=0;
+ unsigned short emblem_id=0, lv;
nullpo_retr(0, bl);
BL_CAST(BL_PC, bl, sd);
diff --git a/src/map/irc.c b/src/map/irc.c
index f1f6b0e0a..fc375ff2d 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -199,8 +199,6 @@ void irc_send(char *buf)
void irc_parse_sub(int fd, char *incoming_string)
{
- int i=0;
- int authed=0;
char kami[256]; //[Zido]
char source[256];
char command[256];
diff --git a/src/map/pet.c b/src/map/pet.c
index 4aef4e9b4..db3ee4928 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -973,7 +973,7 @@ static int pet_ai_sub_hard(struct pet_data *pd,unsigned int tick)
//Return speed to normal.
if (pd->speed != sd->petDB->speed)
- pd->speed == sd->petDB->speed;
+ pd->speed = sd->petDB->speed;
if (pd->target_id) {
target= map_id2bl(pd->target_id);
diff --git a/src/map/script.c b/src/map/script.c
index c9dfb3cd8..d603995d7 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8155,7 +8155,6 @@ int soundeffect_sub(struct block_list* bl,va_list ap)
int buildin_soundeffectall(struct script_state *st)
{
// [Lance] - Improved.
- struct map_session_data *sd=NULL;
char *name, *map = NULL;
struct block_list *bl;
int type, coverage, x0, y0, x1, y1;