diff options
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | db/Changelog.txt | 3 | ||||
| -rw-r--r-- | db/item_db.txt | 2 | ||||
| -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 |
6 files changed, 18 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f6f1b156c..062f25428 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,11 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. + +2007/04/07 + * 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). [Skotlex] 2007/04/06 * Made a crazy attempt to at least partially synchronize login&char code * Major edit to the way the servers handle ip addresses, making them obey diff --git a/db/Changelog.txt b/db/Changelog.txt index 6d22c34be..cfed7180f 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -19,6 +19,9 @@ ----- ======================== + +04/07 + * Corrected Aliza card's item_db line. [Skotlex] 04/05 * Fixed some items that should heal percentual hp/sp [Playtester] 04/04 diff --git a/db/item_db.txt b/db/item_db.txt index 4b0b7a575..90ac712e8 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1577,7 +1577,7 @@ 4397,Tha_Despero_Card,Thanatos Despero Card,6,,10,10,,,,,,,,32,,,,,{ bonus bInt,getrefine()-6; },{},{} 4398,Tha_Dolor_Card,Thanatos Dolor Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bMagicAddRace,RC_Angel,10; },{},{} 4399,Thanatos_Card,Thanatos Card,6,,10,10,,,,,,,,2,,,,,{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; bonus bSPDrainValue,-1; bonus bDef,-30; bonus bFlee,-30; },{},{} -4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,1011,1,50+50*(BaseJob == Job_Dancer),1; } },{},{} +4400,Aliza_Card,Aliza Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,1011,1,50+50*(BaseJob == Job_Dancer),1; },{},{} 4401,Alicel_Card,Alicel Card,6,,10,10,,,,,,,,16,,,,,{ bonus bFlee,10; bonus bDef,-5; },{},{} 4402,Aliot_Card,Aliot Card,6,,10,10,,,,,,,,4,,,,,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) { bonus bStr, 2; bonus bMaxHPrate, 5; } if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) { bonus bInt, 2; bonus bMaxSPrate, 5; } },{},{} 4403,Kiel_Card,Kiel Card,6,,10,10,,,,,,,,769,,,,,{ bonus bDelayRate,-30; },{},{} 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; |