diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-20 16:27:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 16:27:11 +0300 |
| commit | af77eec4f736f989703f81df903a1a7c971fa659 (patch) | |
| tree | ecadc9763347f1c6a04507f714e58f37f778533a /src/char/int_mercenary.c | |
| parent | 68947c86d5fe3eb2686c9b3393e3db0df083bb11 (diff) | |
| parent | 9e02b4ed69ce857e3bda57c7f1d3b2457559c534 (diff) | |
| download | hercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.gz hercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.bz2 hercules-af77eec4f736f989703f81df903a1a7c971fa659.tar.xz hercules-af77eec4f736f989703f81df903a1a7c971fa659.zip | |
Merge pull request #1399 from HerculesWS/settings_libconfig
Ported the configuration to libconfig format
Diffstat (limited to 'src/char/int_mercenary.c')
| -rw-r--r-- | src/char/int_mercenary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/char/int_mercenary.c b/src/char/int_mercenary.c index 0bc3c0909..f96e45a50 100644 --- a/src/char/int_mercenary.c +++ b/src/char/int_mercenary.c @@ -2,7 +2,7 @@ * This file is part of Hercules. * http://herc.ws - http://github.com/HerculesWS/Hercules * - * Copyright (C) 2012-2015 Hercules Dev Team + * Copyright (C) 2012-2016 Hercules Dev Team * Copyright (C) Athena Dev Teams * * Hercules is free software: you can redistribute it and/or modify @@ -168,7 +168,7 @@ bool mapif_mercenary_load(int merc_id, int char_id, struct s_mercenary *merc) SQL->GetData(inter->sql_handle, 3, &data, NULL); merc->kill_count = atoi(data); SQL->GetData(inter->sql_handle, 4, &data, NULL); merc->life_time = atoi(data); SQL->FreeResult(inter->sql_handle); - if( save_log ) + if (chr->show_save_log) ShowInfo("Mercenary loaded (%d - %d).\n", merc->mercenary_id, merc->char_id); return true; |