diff options
| author | Haru <haru@dotalux.com> | 2016-02-15 16:19:38 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-08-19 21:32:12 +0200 |
| commit | 6be7aab17d958e0f5a4be0413b26c7dd81185af6 (patch) | |
| tree | fd0f8cdda6f7da91cefdbb63a39c318916fb06b5 /src/char/int_mercenary.c | |
| parent | 68947c86d5fe3eb2686c9b3393e3db0df083bb11 (diff) | |
| download | hercules-6be7aab17d958e0f5a4be0413b26c7dd81185af6.tar.gz hercules-6be7aab17d958e0f5a4be0413b26c7dd81185af6.tar.bz2 hercules-6be7aab17d958e0f5a4be0413b26c7dd81185af6.tar.xz hercules-6be7aab17d958e0f5a4be0413b26c7dd81185af6.zip | |
Renamed some char and inter server variables
- `int save_log` -> `bool chr->show_save_log`
- `bool char_new` -> `bool enable_char_creation`
- `int log_char` -> `bool chr->enable_logs`
- `int log_inter` -> `bool inter->enable_logs`
- `int chr->new_display` -> `int16 chr->new_display`
- `int char_aegis_delete` -> `bool char_aegis_delete`
Split and improved from Panikon's commit 832fb27d4f767e4bc8b68c432d0da00b7cb7a4f9
Signed-off-by: Haru <haru@dotalux.com>
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; |