diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-06 15:34:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-06 15:34:18 +0000 |
| commit | 8bb15a3eb1653dad66aec5205163a2a4bfa2f149 (patch) | |
| tree | 589eca20ba6d31dc41a318e8344ca62dea6e7bb6 /src | |
| parent | 64f4cc701fb78e585514eaa894dfd98cbbf224bf (diff) | |
| download | hercules-8bb15a3eb1653dad66aec5205163a2a4bfa2f149.tar.gz hercules-8bb15a3eb1653dad66aec5205163a2a4bfa2f149.tar.bz2 hercules-8bb15a3eb1653dad66aec5205163a2a4bfa2f149.tar.xz hercules-8bb15a3eb1653dad66aec5205163a2a4bfa2f149.zip | |
- Corrected Aliza card's item_db line.
- Capped clif_heal's heal field (the argument received is int, but the packet field is short, meaning that if the heal is high enough, the client would receive a negative heal amount).
- Some indentation fixes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10165 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/login/login.c | 4 | ||||
| -rw-r--r-- | src/login_sql/login.c | 12 | ||||
| -rw-r--r-- | src/map/clif.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/login/login.c b/src/login/login.c index c43db8990..4bf36a566 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -1173,10 +1173,10 @@ int mmo_auth(struct mmo_account* account, int fd) len = strlen(account->userid) - 2; // Account creation with _M/_F - if (new_account_flag) + if (new_account_flag) { if (account->passwdenc == 0 && account->userid[len] == '_' && - (account->userid[len+1] == 'F' || account->userid[len+1] == 'M' || + (account->userid[len+1] == 'F' || account->userid[len+1] == 'M' || account->userid[len+1] == 'f' || account->userid[len+1] == 'm') && account_id_count <= END_ACCOUNT_NUM && len >= 4 && strlen(account->passwd) >= 4) { diff --git a/src/login_sql/login.c b/src/login_sql/login.c index cc50e560a..c3c5015b4 100644 --- a/src/login_sql/login.c +++ b/src/login_sql/login.c @@ -833,12 +833,12 @@ int parse_fromchar(int fd) WFIFOHEAD(fd,51); account_id = RFIFOL(fd,2); // speed up for(i = 0; i < AUTH_FIFO_SIZE; i++) { - if (auth_fifo[i].account_id == account_id && - auth_fifo[i].login_id1 == RFIFOL(fd,6) && - auth_fifo[i].login_id2 == RFIFOL(fd,10) && // relate to the versions higher than 18 - auth_fifo[i].sex == RFIFOB(fd,14) && - auth_fifo[i].ip == ntohl(RFIFOL(fd,15)) && - !auth_fifo[i].delflag) + if(auth_fifo[i].account_id == account_id && + auth_fifo[i].login_id1 == RFIFOL(fd,6) && + auth_fifo[i].login_id2 == RFIFOL(fd,10) && // relate to the versions higher than 18 + auth_fifo[i].sex == RFIFOB(fd,14) && + auth_fifo[i].ip == ntohl(RFIFOL(fd,15)) && + !auth_fifo[i].delflag) { auth_fifo[i].delflag = 1; break; diff --git a/src/map/clif.c b/src/map/clif.c index fdba61dba..615b5fee3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4962,7 +4962,7 @@ int clif_heal(int fd,int type,int val) WFIFOHEAD(fd,packet_len(0x13d)); WFIFOW(fd,0)=0x13d; WFIFOW(fd,2)=type; - WFIFOW(fd,4)=val; + WFIFOW(fd,4)=cap_value(val,0,SHRT_MAX); WFIFOSET(fd,packet_len(0x13d)); return 0; |