summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-18Follow up a23d072a66d2569ba13921522be3c82ae9aad576shennetsind2-4/+6
just updating the headers since they were modified. Signed-off-by: shennetsind <ind@henn.et>
2013-12-18Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind8-41/+65
2013-12-18Implementing #define DEVOTION_REFLECT_DAMAGEshennetsind2-2/+23
When enabled, reflect damage doesn't bypass devotion (and thus damage is passed to crusader) Configurable in src/config/general.h As requested by the community (in http://hercules.ws/board/topic/421-suggestion-d/ ) and provided in pull request #209 by Jedzkie. (Committing on his behalf due to issue with automatic merge) Closes #209 Signed-off-by: shennetsind <ind@henn.et>
2013-12-18ItemDB SQL SyncHercules.ws2-19/+19
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-18Merge pull request #236 from missxantara/mastershennetsind6-22/+46
Item database bug fixes.
2013-12-18Fixed Bug 7906shennetsind1-1/+1
http://hercules.ws/board/tracker/issue-7906-compiling-error-latest/ Signed-off-by: shennetsind <ind@henn.et>
2013-12-18HPM Hooks UpdateHercules.ws3-62/+0
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-17Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind1-1/+1
2013-12-17Speed up of several procedures that rely on ERS, _mreallocz ('z'ero)shennetsind11-21/+60
Made Possible Thanks to the Woonderful Haruna! <3 Commit also fixes an inconsistency in the ERS, where it'd start with clear memory but would use garbage upon resizing, also implements a new ERS option that clears entries as soon as pass by ers_free, so that they'll be all shinny for when ers_alloc reuses them. Signed-off-by: shennetsind <ind@henn.et>
2013-12-17Modified Xcodeproj, removed global tab/indentWidth override.shennetsind1-2/+0
Thanks to Haruna! <3 Signed-off-by: shennetsind <ind@henn.et>
2013-12-17Fixed a leftover warning in Release buildsHaru1-1/+1
- Fixes a series of "left-hand operand of comma expression has no effect" in nullpo checks. - Special thanks to ossi0110. Signed-off-by: Haru <haru@dotalux.com>
2013-12-17ItemDB SQL SyncHercules.ws2-679/+679
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-17HPM Hooks UpdateHercules.ws3-72/+42
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-16Merge pull request #237 from HerculesWS/warningsHaruna76-1116/+4208
This adds an Xcode project file (for those who develop on OS X) and fixes several - potential or real - issues we detected thanks to its more strict warnings settings. It also updates the unix build script with similar warning settings.
2013-12-17Fixed some additional linux warningsHaru3-334/+808
- Fixed some warnings we had missed. - Improved -W cflag detection routines. - Only use -Wshadow if it's actually useful. Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Increased warnings level in the unix build scriptsHaru2-21/+408
- They are now on par with the Xcode project (and similar to the MSVC ones) - this will make it easier to notice issues before committing in future. - If this causes, on your system, warnings that we didn't detect, please let us know! Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Fixed several compiler warningsHaru61-690/+878
- Warnings detected thanks to Xcode's compiler settings (more strict by default) and clang, warnings mostly but not only related to data sizes on 64 bit systems, that were silenced until now by very lax compiler settings. - This also decreases by a great deal the amount of warnings produced by MSVC in x64 mode (for the adventurous ones who tried that) - Also fixed (or silenced in case of false positives) the potential issues pointed out by the (awesome) clang static analyzer. - Patch co-produced with Ind, I'm merging and committing in his place! Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Added support for non-aborting assertionsHaru3-41/+71
- Added Assert_ret, Assert_retv, Assert_retb, Assert_retr, working similarly to the corresponding nullpo_ functions. - Moved Assert-related macros to nullpo.h, since they share some functions. Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Nullpo cleanupHaru3-285/+72
- Removed unused, nonportable nullpo checks with formatted message (related: eAthena r15245) - Converted nullpo_chk to a macro, to make it easier on the llvm static analyzer. - Added more details to the nullpo_info reports (related: eAthena r15246) - Ensured that the nullpo check macros evaluate their pointer argument once and only once, so that it's safe to use with expressions that assign values or have side-effects. Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Changed plugin extension from .so to .dylib on OS XHaru3-2/+10
- No functional changes. That's just the correct OS X file extension for dynamic libs. Signed-off-by: Haru <haru@dotalux.com>
2013-12-17Added Apple Xcode project filesHaru10-0/+2218
Signed-off-by: Haru <haru@dotalux.com>
2013-12-16Introducing HPM Support for custom battle confsshennetsind5-3/+103
Special Thanks to Mhalicot. Signed-off-by: shennetsind <ind@henn.et>
2013-12-15Replaced pc->pc_has_permission/can_give_items/can_give_bound_items with ↵shennetsind16-111/+87
equivalent macros Because 2/3 jumps to perform such a operation is just awful Signed-off-by: shennetsind <ind@henn.et>
2013-12-14Replaced pc->get_group_level with a macro (pc_get_group_level)shennetsind10-65/+56
Because 2 jumps to get a single value is just awful. Signed-off-by: shennetsind <ind@henn.et>
2013-12-14Corrected a minor error (wrong constant name) in the bard quest.Haru1-1/+1
Signed-off-by: Haru <haru@dotalux.com>
2013-12-13Follow up b7171479shennetsind1-5/+5
Fixed couple intif.c interface members being called outside the interface Signed-off-by: shennetsind <ind@henn.et>
2013-12-12ensuring script_state is clear (as ers reuses memory).shennetsind1-0/+1
Signed-off-by: shennetsind <ind@henn.et>
2013-12-12Fix core bug issue 7435: When the Storage is openXantara2-0/+6
2013-12-11Item database bug fixes.Xantara4-22/+40
#5608: Proper groups for Lotto Boxes #5625: Missing function for Dungeon Teleport Scroll II #5612: Missing skills
2013-12-11modified second "infinity loop !" error so that its different from the firstshennetsind1-1/+1
and thus doesn't cause confusion (and it wasn't loop-related anyway). Signed-off-by: shennetsind <ind@henn.et>
2013-12-11HPM Hooks UpdateHercules.ws1-60/+60
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-11Corrected some local 'mapindex' variables shadowing the global oneHaru15-41/+40
Signed-off-by: Haru <haru@dotalux.com>
2013-12-10Fixed 64b warnings on db2sqlshennetsind1-5/+5
Special Thanks to Haru! Signed-off-by: shennetsind <ind@henn.et>
2013-12-10Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind4-8/+9
2013-12-09Fixed some logic errorsshennetsind13-106/+126
Special Thanks to Haru Signed-off-by: shennetsind <ind@henn.et>
2013-12-09Fixed a crash when casting GN_SPORE_EXPLOSION on certain systems.Haru3-2/+3
- Follow-up to 44c33fda3614d588e6bf6cee1cf884e98f1531f0. - Also fixed some incorrect va_end calls that came up while debugging. - Special thanks to Ind for his help debugging the problem. Signed-off-by: Haru <haru@dotalux.com>
2013-12-08Follow up d4a58d24d6bcb23a995d62a3d9f9e7190c054b49shennetsind1-3/+1
Enabled plugin access to mapindex interface Signed-off-by: shennetsind <ind@henn.et>
2013-12-08HPM Hooks UpdateHercules.ws1-6/+6
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-08Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind13-19/+19
2013-12-08Fixed cell basilicashennetsind1-0/+4
which was broken 5 years ago in 13106, special Thanks to karazu, Angelmelody and kyeme. Signed-off-by: shennetsind <ind@henn.et>
2013-12-07Fixed angra manyu aspd base calcshennetsind2-5/+11
fixed as in, it now skips the thing entirely, matching official behavior and no longer affected by job-specific modifiers. Thanks to Yommy. Signed-off-by: shennetsind <ind@henn.et>
2013-12-07Fixed several incorrect script labels and eventsHaru13-19/+19
Signed-off-by: Haru <haru@dotalux.com>
2013-12-06removed outdated "pincode incomplete/broken" description on char-server.confshennetsind1-1/+1
Signed-off-by: shennetsind <ind@henn.et>
2013-12-06HPM: mapindex interfaceshennetsind14-194/+226
Signed-off-by: shennetsind <ind@henn.et>
2013-12-06Corrected some potential issues in the questlog systemHaru2-5/+6
- Should fixe bugreport:7888, thanks to rosfus http://hercules.ws/board/tracker/issue-7888-some-issue-crush-my-mapserver - Special thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-12-05Follow-up to 6f55c00e72ca6db130a84fe92218f73a777428f4Haru1-2/+5
- Fixed a memory leak (bugreport:7885), thanks to rosfus http://hercules.ws/board/tracker/issue-7885-memory-leaks-found-at-20131205-20h31m31s-rev-13617/ Signed-off-by: Haru <haru@dotalux.com>
2013-12-05Fixed Bug 7879shennetsind1-5/+7
guild storage would remain locked when the operation failed, now it unlocks regardless of success. Special Thanks to GrumpyPanda http://hercules.ws/board/tracker/issue-7879-guild-storage-bug/ Signed-off-by: shennetsind <ind@henn.et>
2013-12-05HPM Hooks UpdateHercules.ws3-0/+31
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-05Improved script builtin function parserHaru2-75/+87
- Removed duplicate code shared between script_hp_add and script_parse_builtin. - Improved error handling in script_hp_add to be on par with the script_parse_builtin version. - Added script->add_builtin function, providing a hooking point for plugins (i.e. text editor syntax definition generators) to obtain the builtin commands list. - Special thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
2013-12-05Improved plugins MakefileHaru1-2/+11
- It is now possible to build a plugin without adding it to the Makefile, by using 'make plugin.my_plugin_name'. - To have it built through 'make all' or 'make plugins', it is still necessary to add it to the Makefile, as before. Signed-off-by: Haru <haru@dotalux.com>