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

Duel allocation (#2734)

Browse Source 
* Duels are now dynamically created and no longer statically consumes memory.
* Removed max number of duel at once.
* Updated duel modules for multi-thread and safer management.
* Remove various statically allocated tab.
* Removed duplicate code for npc_movenpc.
* Fix few warnings.
Thanks for suggestions from @anacondaqq.
This commit is contained in:
lighta
2017-12-27 19:39:45 -05:00
committed by Aleos
parent ae69e50626
commit 716f6c0f29
10 changed files with 174 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/atcommand.cpp
View File

@@ -5394,7 +5394,7 @@ ACMD_FUNC(skilloff)
*------------------------------------------*/
ACMD_FUNC(npcmove)
{
short x = 0, y = 0, m;
short x = 0, y = 0;
struct npc_data *nd = 0;
char npc_name[NPC_NAME_LENGTH];
@@ -5412,18 +5412,12 @@ ACMD_FUNC(npcmove)
return -1;
}
if ((m=nd->bl.m) < 0 || nd->bl.prev == NULL)
{
if ( npc_movenpc( nd, x, y ) )
{ //actually failed to move
clif_displaymessage(fd, msg_txt(sd,1154)); // NPC is not on this map.
return -1; //Not on a map.
}
x = cap_value(x, 0, map[m].xs-1);
y = cap_value(y, 0, map[m].ys-1);
map_foreachinallrange(clif_outsight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
map_moveblock(&nd->bl, x, y, gettick());
map_foreachinallrange(clif_insight, &nd->bl, AREA_SIZE, BL_PC, &nd->bl);
clif_displaymessage(fd, msg_txt(sd,1155)); // NPC moved.
} else
clif_displaymessage(fd, msg_txt(sd,1155)); // NPC moved
return 0;
}
@@ -8307,14 +8301,12 @@ ACMD_FUNC(invite)
return -1;
}
if(did == 0) {
if(did == 0 || !duel_exist(did) ) {
clif_displaymessage(fd, msg_txt(sd,350)); // "Duel: @invite without @duel."
return 0;
}
if(duel_list[did].max_players_limit > 0 &&
duel_list[did].members_count >= duel_list[did].max_players_limit) {
if( !duel_check_player_limit( duel_get_duelid(did) ) ){
clif_displaymessage(fd, msg_txt(sd,351)); // "Duel: Limit of players is reached."
return 0;
}
@@ -8426,12 +8418,12 @@ ACMD_FUNC(accept)
return 0;
}
if(sd->duel_invite <= 0) {
if(sd->duel_invite <= 0 || !duel_exist(sd->duel_invite) ) {
clif_displaymessage(fd, msg_txt(sd,360)); // "Duel: @accept without invititation."
return 0;
}
if( duel_list[sd->duel_invite].max_players_limit > 0 && duel_list[sd->duel_invite].members_count >= duel_list[sd->duel_invite].max_players_limit )
if( duel_check_player_limit( duel_get_duelid( sd->duel_invite ) ) )
{
clif_displaymessage(fd, msg_txt(sd,351)); // "Duel: Limit of players is reached."
return 0;