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

Some insignificant code tweaks.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13945 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2009-07-11 07:05:05 +00:00
parent b1445ca0ae
commit 0ed37a79b7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/char/char.c
View File

@ -197,7 +197,7 @@ void set_char_online(int map_id, int char_id, int account_id)
struct online_char_data* character; struct online_char_data* character;
character = (struct online_char_data*)idb_ensure(online_char_db, account_id, create_online_char_data); character = (struct online_char_data*)idb_ensure(online_char_db, account_id, create_online_char_data);
if( character->char_id != -1 && character->server > -1 && character->server != map_id && map_id != -3 ) if( character->char_id != -1 && character->server > -1 && character->server != map_id )
{ {
//char == 99 <- Character logging in, so someone has logged in while one //char == 99 <- Character logging in, so someone has logged in while one
//char is still on map-server, so kick him out, but don't print "error" //char is still on map-server, so kick him out, but don't print "error"
@ -253,7 +253,8 @@ void set_char_offline(int char_id, int account_id)
//FIXME? Why Kevin free'd the online information when the char was effectively in the map-server? //FIXME? Why Kevin free'd the online information when the char was effectively in the map-server?
} }
//Remove char if 1- Set all offline, or 2- character is no longer connected to char-server.
if (login_fd > 0 && !session[login_fd]->flag.eof && (char_id == -1 || character == NULL || character->fd == -1)) if (login_fd > 0 && !session[login_fd]->flag.eof && (char_id == -1 || character == NULL || character->fd == -1))
{ {
WFIFOHEAD(login_fd,6); WFIFOHEAD(login_fd,6);
@ -1748,10 +1749,12 @@ int char_divorce(struct mmo_charstatus *cs)
cs->partner_id = 0; cs->partner_id = 0;
char_dat[i].status.partner_id = 0; char_dat[i].status.partner_id = 0;
for(j = 0; j < MAX_INVENTORY; j++) for(j = 0; j < MAX_INVENTORY; j++)
{
if (char_dat[i].status.inventory[j].nameid == WEDDING_RING_M || char_dat[i].status.inventory[j].nameid == WEDDING_RING_F) if (char_dat[i].status.inventory[j].nameid == WEDDING_RING_M || char_dat[i].status.inventory[j].nameid == WEDDING_RING_F)
memset(&char_dat[i].status.inventory[j], 0, sizeof(char_dat[i].status.inventory[0])); memset(&char_dat[i].status.inventory[j], 0, sizeof(char_dat[i].status.inventory[0]));
if (cs->inventory[j].nameid == WEDDING_RING_M || cs->inventory[j].nameid == WEDDING_RING_F) if (cs->inventory[j].nameid == WEDDING_RING_M || cs->inventory[j].nameid == WEDDING_RING_F)
memset(&cs->inventory[j], 0, sizeof(cs->inventory[0])); memset(&cs->inventory[j], 0, sizeof(cs->inventory[0]));
}
return 0; return 0;
} }
} }

2
src/login/account_txt.c
View File

@ -174,7 +174,7 @@ static bool account_db_txt_init(AccountDB* self)
memcpy(tmp, &acc, sizeof(struct mmo_account)); memcpy(tmp, &acc, sizeof(struct mmo_account));
idb_put(accounts, acc.account_id, tmp); idb_put(accounts, acc.account_id, tmp);
if( db->next_account_id < acc.account_id) if( acc.account_id >= db->next_account_id )
db->next_account_id = acc.account_id + 1; db->next_account_id = acc.account_id + 1;
} }

1
src/map/skill.c
View File

@ -7189,7 +7189,6 @@ static int skill_unit_onplace (struct skill_unit *src, struct block_list *bl, un
} }
break; break;
case UNT_SAFETYWALL: case UNT_SAFETYWALL:
//TODO: Find a more reliable way to handle the link to sg, this could cause dangling pointers. [Skotlex]
if (!sce) if (!sce)
sc_start4(bl,type,100,sg->skill_lv,sg->group_id,sg->group_id,0,sg->limit); sc_start4(bl,type,100,sg->skill_lv,sg->group_id,sg->group_id,0,sg->limit);
break; break;

4
src/plugins/dbghelpplug.c
View File

@ -108,7 +108,7 @@ typedef enum _UdtKind
UdtClass, UdtClass,
UdtUnion UdtUnion
} UdtKind; } UdtKind;
/*
typedef enum _SymTag { typedef enum _SymTag {
SymTagNull = 0, SymTagNull = 0,
SymTagExe = 1, SymTagExe = 1,
@ -142,7 +142,7 @@ typedef enum _SymTag {
SymTagManagedType = 29, SymTagManagedType = 29,
SymTagDimension = 30 SymTagDimension = 30
} SymTag; } SymTag;
*/
#endif /* _NO_CVCONST_H */ #endif /* _NO_CVCONST_H */