summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 05:05:48 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 05:05:48 +0000
commitbeb675a9eb04cde7491e2a93b40a3e19af84393f (patch)
tree7f9a34d307a8d71cf8c3ed98cf609fbb6ed00ae1 /src
parent11cdf0d8533f6e27922f423ba645ddf0ff945c42 (diff)
downloadhercules-beb675a9eb04cde7491e2a93b40a3e19af84393f.tar.gz
hercules-beb675a9eb04cde7491e2a93b40a3e19af84393f.tar.bz2
hercules-beb675a9eb04cde7491e2a93b40a3e19af84393f.tar.xz
hercules-beb675a9eb04cde7491e2a93b40a3e19af84393f.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@832 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/char_sql/int_guild.c5
-rw-r--r--src/map/atcommand.c9
2 files changed, 4 insertions, 10 deletions
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;