summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt1
-rw-r--r--Dev/bugs.txt6
-rw-r--r--src/char_sql/int_guild.c5
-rw-r--r--src/map/atcommand.c9
4 files changed, 8 insertions, 13 deletions
diff --git a/Changelog.txt b/Changelog.txt
index ddab0bc2d..e365d2311 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/27
+ * Fixed the guild issues (SVN 832) [MouseJstr]
* Updated description for player_check_cloak_type [celest]
* Increased skill range limitations in pc_no_footset [celest]
* Added exp_calc_type - to alternate between 3 different versions for exp
diff --git a/Dev/bugs.txt b/Dev/bugs.txt
index eb3e00bd0..3ec160242 100644
--- a/Dev/bugs.txt
+++ b/Dev/bugs.txt
@@ -103,8 +103,8 @@ Progress: 0%
Problem: Guilds BUG (it isn't related to the scripts, because noone change them recently)
When some guild SEIZE any castle, then Castle N 1 becomes their own, too (not M 0, but M 1)
-Assigned: N/A
-Progress: 0%
+Assigned: MouseJstr
+Progress: 100%
Problem: Storage BUGS! Items doubles/clones again any kinds of items! (due to "latest storage fix")
Assigned: N/A
@@ -132,4 +132,4 @@ Progress: 0%
battle.c:3078: Element size: 4 bytes
battle.c:3078: Number of elements: 16
battle.c:3078: Created at: malloc.c, line 23
- battle.c:3078: Storage class: heap \ No newline at end of file
+ battle.c:3078: Storage class: heap
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 44ccdffbd..030201aa4 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -523,7 +523,7 @@ int inter_guildcastle_tosql(struct guild_castle *gc)
{
struct guild_castle *gcopy;
// `guild_castle` (`castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, `visibleC`, `visibleG0`, `visibleG1`, `visibleG2`, `visibleG3`, `visibleG4`, `visibleG5`, `visibleG6`, `visibleG7`)
-
+
if (gc==NULL) return 0;
//printf("Save to guild_castle\n");
@@ -577,7 +577,7 @@ int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
if (gc==NULL) return 0;
//printf("Read from guild_castle\n");
- gcopy = numdb_search(castle_db_,gc->castle_id);
+ gcopy = numdb_search(castle_db_, castle_id);
if (gcopy == NULL) {
gcopy = (struct guild_castle *) aMalloc(sizeof(struct guild_castle));
numdb_insert(castle_db_, gc->castle_id, gcopy);
@@ -586,7 +586,6 @@ int inter_guildcastle_fromsql(int castle_id,struct guild_castle *gc)
return 0;
}
- memset(gc,0,sizeof(struct guild_castle));
gc->castle_id=castle_id;
if (castle_id==-1) return 0;
sprintf(tmp_sql,"SELECT `castle_id`, `guild_id`, `economy`, `defense`, `triggerE`, `triggerD`, `nextTime`, `payTime`, `createTime`, "
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 95744e653..60c49774e 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2729,13 +2729,8 @@ int atcommand_dye(const int fd, struct map_session_data* sd, const char* command
}
if (cloth_color >= MIN_CLOTH_COLOR && cloth_color <= MAX_CLOTH_COLOR) {
- if (cloth_color != 0 && sd->status.sex == 1 && (sd->status.class == 12 || sd->status.class == 17)) {
- clif_displaymessage(fd, msg_table[35]); // You can't use this command with this class.
- return -1;
- } else {
- pc_changelook(sd, LOOK_CLOTHES_COLOR, cloth_color);
- clif_displaymessage(fd, msg_table[36]); // Appearence changed.
- }
+ pc_changelook(sd, LOOK_CLOTHES_COLOR, cloth_color);
+ clif_displaymessage(fd, msg_table[36]); // Appearence changed.
} else {
clif_displaymessage(fd, msg_table[37]); // An invalid number was specified.
return -1;