diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-23 04:17:40 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-23 04:17:40 +0000 |
commit | aa1ace872a37eda084cda4715c76bee2968b691f (patch) | |
tree | ec9bf7ca9185a4a168510ea07b54ccaec7936b73 /src/login/login.c | |
parent | 9597b48160531538468275a9dcdedfab843341dd (diff) | |
download | hercules-aa1ace872a37eda084cda4715c76bee2968b691f.tar.gz hercules-aa1ace872a37eda084cda4715c76bee2968b691f.tar.bz2 hercules-aa1ace872a37eda084cda4715c76bee2968b691f.tar.xz hercules-aa1ace872a37eda084cda4715c76bee2968b691f.zip |
- Updated Box of thunder to use "agi up" effect for 30 secs instead of NPC Agi Up for 20.
- Guild expulsion now will fail when the character to be kicked is in a guild castle (rather than checking for the character doing the expulsion)
- pk damage reduction settings now will take effect only on Player VS player damage.
- Fixed produce_db2.txt entries overwriting produce_db.txt ones.
- Fixed item-granted/plagiarized skills unlocking skill trees when only your real learned level should.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9902 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/login/login.c')
-rw-r--r-- | src/login/login.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/login/login.c b/src/login/login.c index 95abd0006..5a6ed4829 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -1317,7 +1317,7 @@ int mmo_auth(struct mmo_account* account, int fd) { struct online_login_data* data = idb_get(online_db,auth_dat[i].account_id); if (data && data->char_server > -1) { //Request char servers to kick this account out. [Skotlex] - ShowWarning("User [%d] is already online - Rejected.\n",auth_dat[i].account_id); + ShowNotice("User [%d] is already online - Rejected.\n",auth_dat[i].account_id); WBUFW(buf,0) = 0x2734; WBUFL(buf,2) = auth_dat[i].account_id; charif_sendallwos(-1, buf, 6); @@ -3039,15 +3039,15 @@ int lan_subnetcheck(long *p) { sbn = (char *)&subnet[i].subnet; msk = (char *)&subnet[i].mask; - +/* ShowInfo("Subnet check [%u.%u.%u.%u]: Matches "CL_CYAN"%u.%u.%u.%u/%u.%u.%u.%u"CL_RESET"\n", src[0], src[1], src[2], src[3], sbn[0], sbn[1], sbn[2], sbn[3], msk[0], msk[1], msk[2], msk[3]); - +*/ return subnet[i].char_ip; } } - ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", src[0], src[1], src[2], src[3]); +// ShowInfo("Subnet check [%u.%u.%u.%u]: "CL_CYAN"WAN"CL_RESET"\n", src[0], src[1], src[2], src[3]); return 0; } @@ -3247,12 +3247,7 @@ int parse_login(int fd) { return 0; } ld = (struct login_session_data*)aCalloc(1, sizeof(struct login_session_data)); - session[fd]->session_data = ld; - if (!ld) { - ShowFatalError("login: Request for md5 key: memory allocation failure (malloc)!\n"); - session[fd]->eof = 1; - return 0; - } + session[fd]->session_data = ld; if (RFIFOW(fd,0) == 0x01db) login_log("Sending request of the coding key (ip: %s)" RETCODE, ip); else |