diff options
| author | valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-05 20:59:29 +0000 |
|---|---|---|
| committer | valaris <valaris@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-11-05 20:59:29 +0000 |
| commit | ac593dc91efaf23a881e8a8b86f3a72c6621cb36 (patch) | |
| tree | 9ad7cefc60cc9251b3e497cccf10e544e43d28a5 /src/map | |
| parent | e35ad7efa0336d241f252ccf6bbaed2e2fa4598d (diff) | |
| download | hercules-ac593dc91efaf23a881e8a8b86f3a72c6621cb36.tar.gz hercules-ac593dc91efaf23a881e8a8b86f3a72c6621cb36.tar.bz2 hercules-ac593dc91efaf23a881e8a8b86f3a72c6621cb36.tar.xz hercules-ac593dc91efaf23a881e8a8b86f3a72c6621cb36.zip | |
Fixed crash from guild skill point allocation, there seems to be a problem with guilds loading still.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@16 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/intif.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | src/map/skill.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index a2bdbe7ee..5b5ddc8d7 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -473,8 +473,8 @@ int intif_guild_skillup(int guild_id,int skill_num,int account_id,int flag) WFIFOL(inter_fd, 2)=guild_id;
WFIFOL(inter_fd, 6)=skill_num;
WFIFOL(inter_fd,10)=account_id;
- WFIFOL(inter_fd,14)=flag;
- WFIFOSET(inter_fd,18);
+ //WFIFOL(inter_fd,14)=flag;
+ WFIFOSET(inter_fd,14);
return 0;
}
// ギルド同盟/敵対要求
diff --git a/src/map/script.c b/src/map/script.c index 534e50cd1..1636c7f45 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -3182,7 +3182,7 @@ int buildin_getskilllv(struct script_state *st) * skill_id = 10000 : GD_APPROVAL
* 10001 : GD_KAFRACONTACT
* 10002 : GD_GUARDIANRESEARCH
- * 10003 : GD_CHARISMA
+ * 10003 : GD_GUARDUP
* 10004 : GD_EXTENSION
*------------------------------------------
*/
diff --git a/src/map/skill.h b/src/map/skill.h index 468e5d3af..dd035b8af 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -835,7 +835,6 @@ enum { GD_APPROVAL=10000,
GD_KAFRACONTACT=10001,
GD_GUARDIANRESEARCH=10002,
- GD_CHARISMA=10003,
GD_GUARDUP=10003,
GD_EXTENSION=10004,
GD_GLORYGUILD=10005,
|