diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/map.c | 4 | ||||
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index 039bdc5f2..db555d747 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2530,7 +2530,7 @@ int flush_timer(int tid, unsigned int tick, int id, int data){ int id_db_final(void *k,void *d,va_list ap) { struct mob_data *id; -// nullpo_retr(0, id=d); + nullpo_retr(0, id=d); if(id->lootitem) free(id->lootitem); if(id) @@ -2601,7 +2601,7 @@ void do_final(void) { // do_final_timer(); (we used timer_final() instead) timer_final(); - numdb_final(id_db, id_db_final); +// numdb_final(id_db, id_db_final); strdb_final(map_db, map_db_final); strdb_final(nick_db, nick_db_final); numdb_final(charid_db, charid_db_final); diff --git a/src/map/map.h b/src/map/map.h index f25ebba30..acc285d67 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -16,7 +16,7 @@ #define LIFETIME_FLOORITEM 60 #define DAMAGELOG_SIZE 30 #define LOOTITEM_SIZE 10 -#define MAX_SKILL_LEVEL 20 +#define MAX_SKILL_LEVEL 100 #define MAX_STATUSCHANGE 210 #define MAX_SKILLUNITGROUP 32 #define MAX_MOBSKILLUNITGROUP 8 diff --git a/src/map/pc.c b/src/map/pc.c index 3dbfc4e88..7fff1f1ae 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6785,6 +6785,8 @@ int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name) nullpo_retr(0, sd); + Assert(strlen(name) < 24); + for(i=0;i<MAX_EVENTTIMER;i++) if( sd->eventtimer[i]==-1 ) break; |