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

Hid timer function parameters in a macro (#3311)

Browse Source
This commit is contained in:
Lemongrass3110
2018-07-15 23:17:15 +02:00
committed by GitHub
parent ec1d6d28d7
commit c4d7dc76d3
49 changed files with 160 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/map.cpp
View File

@@ -252,8 +252,7 @@ int map_freeblock_unlock (void)
// Timer function to check if there some remaining lock and remove them if so.
// Called each 1s
int map_freeblock_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(map_freeblock_timer){
if (block_free_lock > 0) {
ShowError("map_freeblock_timer: block_free_lock(%d) is invalid.\n", block_free_lock);
block_free_lock = 1;
@@ -1506,8 +1505,7 @@ int map_get_new_object_id(void)
* Timered function to clear the floor (remove remaining item)
* Called each flooritem_lifetime ms
*------------------------------------------*/
int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(map_clearflooritem_timer){
struct flooritem_data* fitem = (struct flooritem_data*)idb_get(id_db, id);
if (fitem == NULL || fitem->bl.type != BL_ITEM || (fitem->cleartimer != tid)) {
@@ -2781,8 +2779,7 @@ int map_removemobs_sub(struct block_list *bl, va_list ap)
return 1;
}
int map_removemobs_timer(int tid, unsigned int tick, int id, intptr_t data)
{
TIMER_FUNC(map_removemobs_timer){
int count;
const int16 m = id;