summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2014-01-12Follow up 20bdc01fa687b174a732be4483ddea4982d67ce9shennetsind1-4/+15
Fixed scripting deficiency of being unable to tell whether a user is assigned to a specific instance or not ( 20bdc01fa687b174a732be4483ddea4982d67ce9 removed that ability ), because users can be assigned to more than a single instance on hercules, the previous instance_id(<va>) isn't viable, so I'm introducing has_instance2("<map_name>"), returns the instance id of that map for the user (as long as the user is assigned to a instead with that map), -1 upon failure -- valid instance ids are >= 0. Signed-off-by: shennetsind <ind@henn.et>
2014-01-12Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind11-73/+68
2014-01-12Follow up 95f13f3420822111f928ba6079fbc2061bd38c5fshennetsind1-16/+16
Fixed handling of arrays with 1-member and on index[0]. Thanks to Haruna. Signed-off-by: shennetsind <ind@henn.et>
2014-01-12Changed some void* to the correct data types where applicableHaru11-72/+67
Signed-off-by: Haru <haru@dotalux.com>
2014-01-12Corrected a 32 bit warningHaru1-1/+1
- Follow-up to 82b583b5ef4e729ad2c3c74b26adce16a145605a - Committing on Ind's behalf Signed-off-by: Haru <haru@dotalux.com>
2014-01-12Fixed Bug 7963shennetsind1-1/+1
Syntax error when compiling with GP_BOUND_ITEMS disabled. http://hercules.ws/board/tracker/issue-7963-intifc-compile-error/ Signed-off-by: shennetsind <ind@henn.et>
2014-01-12Fixed Bug 7967shennetsind1-0/+1
temporary pc regs (@) were being misflagged. http://hercules.ws/board/tracker/issue-7967-scriptc-leaks/ Signed-off-by: shennetsind <ind@henn.et>
2014-01-12Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-0/+30
2014-01-12Two Adjustmentsshennetsind4-14/+6
From some notes I took while working on the megapatch: - Dropped unused char_dat variable in chrif's auth_node - Fixed DB/BB/PB Logging, which could create false logs due to where it was placed. Signed-off-by: shennetsind <ind@henn.et>
2014-01-12HPM Hooks UpdateHercules.ws3-0/+30
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-01-12Fixed ERS Cache sharingshennetsind7-22/+39
Enforcing cache to match the option condition in order for it to be shared. Special Thanks to Haruna! Signed-off-by: shennetsind <ind@henn.et>
2014-01-12Adjusted indexing of vars with index 0shennetsind2-8/+67
Special Thanks to Haruna. Also fixed a compiler warning, thanks to ossi0110 Signed-off-by: shennetsind <ind@henn.et>
2014-01-11Follow up 82b583b5ef4e729ad2c3c74b26adce16a145605ashennetsind2-11/+11
Fixed mapreg reload issue, sql_query not returning results, and caused deletearray to no longer display error messages when the array in question is not available. Special Thanks to Haruna, ossi0110 Signed-off-by: shennetsind <ind@henn.et>
2014-01-11Fixed Bug 7960shennetsind2-3/+5
http://hercules.ws/board/tracker/issue-7960-scriptc-warnings/ Also applied a temporary adjustment due to ERS_OPT_CLEAN not being consistent (decent fix will follow up, haru and i are working on it) -- thanks to kyeme for pointing it out! Signed-off-by: shennetsind <ind@henn.et>
2014-01-11Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-146/+610
2014-01-11Follow up 82b583b5ef4e729ad2c3c74b26adce16a145605ashennetsind1-1/+0
Forgot to remove this little fella. Thanks to kyeme! Signed-off-by: shennetsind <ind@henn.et>
2014-01-11HPM Hooks UpdateHercules.ws3-146/+610
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-01-11Hercules 1st 2014 MegaPatchshennetsind30-1256/+1994
http://hercules.ws/board/topic/3886-hercules-1st-2014-megapatch/ Signed-off-by: shennetsind <ind@henn.et>
2014-01-09Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind12-2765/+2698
2014-01-09Fixed Bug#7826malufett1-0/+6
-http://hercules.ws/board/tracker/issue-7826-card-compound/?gopid=21081#entry21081 Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2014-01-08Fixed Bug#7944malufett1-1/+1
-http://hercules.ws/board/tracker/issue-7944-all-hidecloaking-skills-in-pvpduelwoe/?gopid=21579#entry21579 Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2014-01-08Introducing Hercules Autotrade Persistencyshennetsind11-30/+321
Aka autotrading merchants survive server restarts. Originally sekai's (aka me). Special Thanks to Haruna, Michieru. Signed-off-by: shennetsind <ind@henn.et>
2014-01-03Fixed Bug#7709malufett3-46/+43
-http://hercules.ws/board/tracker/issue-7709-overbrand/?gopid=20445#entry20445 Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2014-01-01HPM Hooks UpdateHercules.ws3-0/+30
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2014-01-01Correctly removed persistent database entries for disabled NPC Market scriptsHaru2-7/+15
- When a Market script is disabled or removed, its database entries are now correctly cleared upon reloadscript and/or server restart. - Special thanks to ossi0110. Signed-off-by: Haru <haru@dotalux.com>
2013-12-31Fixed issues pointed out in Report 7909shennetsind3-5/+5
Special Thanks to Vader. http://hercules.ws/board/tracker/issue-7909-some-code-errors-and-optimisations/ Signed-off-by: shennetsind <ind@henn.et>
2013-12-30Fixed account expiration timeshennetsind4-13/+38
Login server no longer insta-denies expired accounts, as there may be free to play (or non paying) char server modes in the list, also made sure type 3 is sent as normal mode to non-expired accounts (client has a hardcoded if type == 3 => "claim need to pay & deny message" Special Thanks to Beret. Signed-off-by: shennetsind <ind@henn.et>
2013-12-30HPM Hooks UpdateHercules.ws1-8/+9
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-30Whitespace fixes in script.cHaru1-2379/+2370
Signed-off-by: Haru <haru@dotalux.com>
2013-12-30Added support for string vars on commands that require a stringHaru2-312/+215
- Fixes bugreport:7901, thanks to Angelmelody http://hercules.ws/board/tracker/issue-7901-about-pass-variable-type-as-function-parameter - Bonus: debugmes can now take both strings and numbers (i.e. to print a number variable you no longer need to do 'debugmes "" + .@num;') Signed-off-by: Haru <haru@dotalux.com>
2013-12-30Fixed Bug#7728malufett1-1/+0
-http://hercules.ws/board/tracker/issue-7728-grand-cross/
2013-12-30Fixed Bug#7735malufett4-22/+20
-http://hercules.ws/board/tracker/issue-7735-royal-guards-rage-burst/ Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
2013-12-24Merge branch 'master' of https://github.com/HerculesWS/Herculesshennetsind3-6/+399
2013-12-24Follow up cf19b26d50ac96111e44c33a80afd1f1ea935cecshennetsind1-3/+9
Fixed selllist on zeny trader. Special Thanks to Thunderbolt, bleachftl and Frost Signed-off-by: shennetsind <ind@henn.et>
2013-12-24HPM Hooks UpdateHercules.ws3-6/+399
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-24Christmas Patch - 2013-12-23 Supportshennetsind12-322/+1293
Info: http://hercules.ws/board/topic/3614-christmas-patch-gifto/ Signed-off-by: shennetsind <ind@henn.et>
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/Herculesshennetsind1-0/+5
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-18Merge pull request #236 from missxantara/mastershennetsind1-0/+5
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-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-17HPM Hooks UpdateHercules.ws3-72/+42
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
2013-12-17Fixed some additional linux warningsHaru1-4/+4
- 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-17Fixed several compiler warningsHaru45-618/+723
- 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>