Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Merged mail system to Stable. Need a second check... please wait.

Browse Source 
- No packet added until everything is done.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12287 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
zephyrus 2008-03-03 22:03:38 +00:00
parent 021af17a50
commit fee18c4efb
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/char_sql/char.c
View File

@ -60,6 +60,7 @@ char guild_storage_db[256] = "guild_storage";
char party_db[256] = "party";
char pet_db[256] = "pet";
char mail_db[256] = "mail"; // MAIL SYSTEM
char auction_db[256] = "auction"; // Auctions System
char friend_db[256] = "friends";
char hotkey_db[256] = "hotkey";
@ -3598,6 +3599,8 @@ void sql_config_read(const char* cfgName)
strcpy(pet_db,w2);
else if(!strcmpi(w1,"mail_db"))
strcpy(mail_db,w2);
else if(!strcmpi(w1,"auction_db"))
strcpy(auction_db,w2);
else if(!strcmpi(w1,"friend_db"))
strcpy(friend_db,w2);
else if(!strcmpi(w1,"hotkey_db"))

1
src/char_sql/char.h
View File

@ -58,6 +58,7 @@ extern char guild_storage_db[256];
extern char party_db[256];
extern char pet_db[256];
extern char mail_db[256];
extern char auction_db[256];
extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris]

10
src/map/atcommand.c
View File

@ -6069,7 +6069,7 @@ int atcommand_autoloot(const int fd, struct map_session_data* sd, const char* co
clif_displaymessage(fd, "Autolootitem is now off.");
}
return 0;
return 0;
}
/*==========================================
* @autolootitem
@ -7600,7 +7600,7 @@ static int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
return 0;
id = va_arg(ap, int);
time = va_arg(ap, int);
time = va_arg(ap, int);
if (id != bl->id && !pc_isGM(pl_sd)) {
pl_sd->status.manner -= time;
@ -7655,7 +7655,7 @@ int atcommand_me(const int fd, struct map_session_data* sd, const char* command,
char tempmes[200];
nullpo_retr(-1, sd);
memset(tempmes, '\0', sizeof(tempmes));
memset(tempmes, '\0', sizeof(tempmes));
memset(atcmd_output, '\0', sizeof(atcmd_output));
if (sd->sc.count && //no "chatting" while muted.
@ -7705,7 +7705,7 @@ int atcommand_size(const int fd, struct map_session_data* sd, const char* comman
/*==========================================
* @monsterignore
* => Makes monsters ignore you. [Valaris]
*------------------------------------------*/
*------------------------------------------*/
int atcommand_monsterignore(const int fd, struct map_session_data* sd, const char* command, const char* message)
{
nullpo_retr(-1, sd);
@ -8062,7 +8062,7 @@ int atcommand_clone(const int fd, struct map_session_data* sd, const char* comma
x = sd->bl.x;
y = sd->bl.y;
}
if((x = mob_clone_spawn(pl_sd, sd->bl.m, x, y, "", master, 0, flag?1:0, 0)) > 0) {
clif_displaymessage(fd, msg_txt(128+flag*2)); // Evil Clone spawned. Clone spawned. Slave clone spawned.
return 0;