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

Bug Fixes

Browse Source 
* Fixes #475 - Added missing Roulette packet lengths.
* Fixed a few issues with character gender changes for 20141016 and up. Thanks to @cydh's eagle eyes!
* Fixed a small typo in 'upgrade_20150619_log.sql'.
* Removed an unused variable.
This commit is contained in:
aleos89 2015-06-22 15:05:18 -04:00
parent 1b3d5e5c55
commit 9fd34b2439
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql-files/upgrades/upgrade_20150619_log.sql
View File

@ -1 +1 @@
ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F','Y') NOT NULL default 'P', ALTER TABLE `picklog` MODIFY `type` enum('M','P','L','T','V','S','N','C','A','R','G','E','B','O','I','X','D','U','$','F','Y') NOT NULL default 'P';

14
src/char/char_mapif.c
View File

@ -756,7 +756,7 @@ int chmapif_parse_fwlog_changestatus(int fd){
char* data; char* data;
Sql_GetData(sql_handle, 0, &data, NULL); t_aid = atoi(data); Sql_GetData(sql_handle, 0, &data, NULL); t_aid = atoi(data);
Sql_GetData(sql_handle, 0, &data, NULL); t_cid = atoi(data); Sql_GetData(sql_handle, 1, &data, NULL); t_cid = atoi(data);
Sql_FreeResult(sql_handle); Sql_FreeResult(sql_handle);
if(!chlogif_isconnected()) if(!chlogif_isconnected())
@ -1033,7 +1033,8 @@ int chmapif_parse_reqauth(int fd, int id){
} }
if( runflag == CHARSERVER_ST_RUNNING && autotrade && cd ){ if( runflag == CHARSERVER_ST_RUNNING && autotrade && cd ){
uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25; uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25;
cd->sex = sex; if (cd->sex == 99)
cd->sex = sex;
WFIFOHEAD(fd,mmo_charstatus_len); WFIFOHEAD(fd,mmo_charstatus_len);
WFIFOW(fd,0) = 0x2afd; WFIFOW(fd,0) = 0x2afd;
@ -1053,9 +1054,12 @@ int chmapif_parse_reqauth(int fd, int id){
node != NULL && node != NULL &&
node->account_id == account_id && node->account_id == account_id &&
node->char_id == char_id && node->char_id == char_id &&
node->login_id1 == login_id1 && node->login_id1 == login_id1
node->sex == sex /*&& //&& node->ip == ip
node->ip == ip*/ ) #ifdef PACKETVER < 20141016
&& node->sex == sex
#endif
)
{// auth ok {// auth ok
uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25; uint16 mmo_charstatus_len = sizeof(struct mmo_charstatus) + 25;
if (cd->sex == 99) if (cd->sex == 99)

4
src/map/clif.c
View File

@ -18372,8 +18372,8 @@ void packetdb_readdb(bool reload)
#else #else
269, 0, 0, 2, 6, 48, 6, 9, 26, 45, 47, 47, 56, -1, 0, 0, 269, 0, 0, 2, 6, 48, 6, 9, 26, 45, 47, 47, 56, -1, 0, 0,
#endif #endif
0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 2, 23, 2, -1, 2, 3, 2,
0, 3, 5, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 3, 5, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}; };
struct { struct {

2
src/map/itemdb.c
View File

@ -1155,7 +1155,7 @@ bool itemdb_parse_roulette_db(void)
* Free Roulette items * Free Roulette items
*/ */
static void itemdb_roulette_free(void) { static void itemdb_roulette_free(void) {
int i, j; int i;
for (i = 0; i < MAX_ROULETTE_LEVEL; i++) { for (i = 0; i < MAX_ROULETTE_LEVEL; i++) {
if (rd.nameid[i]) if (rd.nameid[i])