diff options
| author | Piotr Hałaczkiewicz <piotr.halaczkiewicz@gmail.com> | 2013-07-31 05:07:50 -0700 |
|---|---|---|
| committer | Piotr Hałaczkiewicz <piotr.halaczkiewicz@gmail.com> | 2013-07-31 05:07:50 -0700 |
| commit | 871e2f2a56431cf13f193e00b261aae5460bebc1 (patch) | |
| tree | aa2c7bd3223471328452b7b7980c0a379a9d4b9f /src/map/battle.c | |
| parent | 43d95751dcc937a2caddb5b793f5c45666abfee0 (diff) | |
| parent | e7750ecfff5bf856ecc9f38ea327c6b6cc535761 (diff) | |
| download | hercules-871e2f2a56431cf13f193e00b261aae5460bebc1.tar.gz hercules-871e2f2a56431cf13f193e00b261aae5460bebc1.tar.bz2 hercules-871e2f2a56431cf13f193e00b261aae5460bebc1.tar.xz hercules-871e2f2a56431cf13f193e00b261aae5460bebc1.zip | |
Merge pull request #71 from HerculesWS/permission-cache-fix
Permission cache overhaul
* Reworked group permission caching in session data (follow-up to cd45c30ab2dcc44bfbfac283d15bb09b3d4644bc)
* Removed duplicated information from session data in favor of direct pointer to group settings.
* Added getters for all group data required to process permissions and related stuff.
* Added new functions to PC interface and updated calls everywhere.
* Extracted function to set new group for a player (used at login, group config reload, manual adjustment of group).
* Moved command permission config parsing to atcommand module.
* Improved dummy map session handling.
* Since it's required for all map sessions to have a valid group, dummy sessions are now created by a designated function.
* Updated related code that uses dummy sessions (console `gm use` and script `atcommand`, `useatcmd`).
* Various minor improvements and cleanups.
* Eliminated some global variables related to loading atcommand permissions for group by passing them directly to function.
* Moved definition of global array holding PC permission names from header file to source file.
* Streamlined destuction of atcommands database to use DBApply helper function instead of DBIterator.
* Replaced hardcoded position of console dummy session with defines from mapindex.h (thx Haruna for pointing it out).
* Removed fixed length restriction on group names.
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 613ea6258..f72bdce06 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -5785,11 +5785,11 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f if ( s_bl->type == BL_PC ) { switch( t_bl->type ) { case BL_MOB: // Source => PC, Target => MOB - if ( pc_has_permission((TBL_PC*)s_bl, PC_PERM_DISABLE_PVM) ) + if (pc->has_permission((TBL_PC*)s_bl, PC_PERM_DISABLE_PVM) ) return 0; break; case BL_PC: - if (pc_has_permission((TBL_PC*)s_bl, PC_PERM_DISABLE_PVP)) + if (pc->has_permission((TBL_PC*)s_bl, PC_PERM_DISABLE_PVP)) return 0; break; default:/* anything else goes */ |