diff options
| author | Haru <haru@dotalux.com> | 2019-11-17 16:54:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 16:54:11 +0100 |
| commit | 1f000882ca8ce9d4bb48757b81848b8b6a98ad0e (patch) | |
| tree | 34855b2936e1197385417dca7905b7a8fd9c97d5 /src/map | |
| parent | 76c5cbecee3441a8dbd1f729e09db78af94be056 (diff) | |
| parent | 8b361e2b31d9926a83befb012a27edc4c6ee59d1 (diff) | |
| download | hercules-1f000882ca8ce9d4bb48757b81848b8b6a98ad0e.tar.gz hercules-1f000882ca8ce9d4bb48757b81848b8b6a98ad0e.tar.bz2 hercules-1f000882ca8ce9d4bb48757b81848b8b6a98ad0e.tar.xz hercules-1f000882ca8ce9d4bb48757b81848b8b6a98ad0e.zip | |
Merge pull request #2560 from dastgirp/logs/item
Fixes some confusion in logs and added new log type
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/achievement.c | 4 | ||||
| -rw-r--r-- | src/map/log.c | 3 | ||||
| -rw-r--r-- | src/map/log.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/map/achievement.c b/src/map/achievement.c index c2ebb5fdd..5215526a9 100644 --- a/src/map/achievement.c +++ b/src/map/achievement.c @@ -1051,10 +1051,10 @@ static void achievement_get_rewards_items(struct map_session_data *sd, const str if (!itemdb->isstackable(it.nameid)) { it.amount = 1; for (int j = 0; j < total; ++j) - pc->additem(sd, &it, 1, LOG_TYPE_SCRIPT); + pc->additem(sd, &it, 1, LOG_TYPE_ACHIEVEMENT); } else { it.amount = total; - pc->additem(sd, &it, total, LOG_TYPE_SCRIPT); + pc->additem(sd, &it, total, LOG_TYPE_ACHIEVEMENT); } } } diff --git a/src/map/log.c b/src/map/log.c index aa2f5f8f3..45335b16a 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -48,7 +48,7 @@ static char log_picktype2char(e_log_pick_type type) switch( type ) { case LOG_TYPE_TRADE: return 'T'; // (T)rade case LOG_TYPE_VENDING: return 'V'; // (V)ending - case LOG_TYPE_PICKDROP_PLAYER: return 'P'; // (P)player + case LOG_TYPE_PICKDROP_PLAYER: return 'P'; // (P)layer case LOG_TYPE_PICKDROP_MONSTER: return 'M'; // (M)onster case LOG_TYPE_NPC: return 'S'; // NPC (S)hop case LOG_TYPE_SCRIPT: return 'N'; // (N)PC Script @@ -75,6 +75,7 @@ static char log_picktype2char(e_log_pick_type type) case LOG_TYPE_SKILL: return '1'; // Skill case LOG_TYPE_REFINE: return '2'; // Refine case LOG_TYPE_OTHER: return 'X'; // Other + case LOG_TYPE_ACHIEVEMENT: return '3'; // Achievement } // should not get here, fallback diff --git a/src/map/log.h b/src/map/log.h index 116d99bfd..5035e9526 100644 --- a/src/map/log.h +++ b/src/map/log.h @@ -87,9 +87,9 @@ typedef enum e_log_pick_type { LOG_TYPE_QUEST = 0x02000000, LOG_TYPE_SKILL = 0x04000000, LOG_TYPE_REFINE = 0x08000000, + LOG_TYPE_LOOT = 0x10000000, + LOG_TYPE_ACHIEVEMENT = 0x20000000, - // combinations - LOG_TYPE_LOOT = LOG_TYPE_PICKDROP_MONSTER|LOG_TYPE_CONSUME, // all LOG_TYPE_ALL = 0xFFFFFFFF, } e_log_pick_type; |