5090 Commits

Author SHA1 Message Date
Skotlex
1a369e2eb5 - Fixed @reloadmobdb wiping out monster spawn information
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14951 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-02 07:31:33 +00:00
ultramage
225a4b2ce2 Fixed 'getitem' documentation typo (stating the optional 3rd argument is char id instead of account id).
Initial documentation mistakes from r2402, propagated to code documentation in r9599, only partially fixed in r12648.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-01 21:19:10 +00:00
Skotlex
4fed311425 - Updated mmo_char_tosql and memitemdata_to_sql to keep a count of errors while saving a character. If there are any errors, the in-memory copy (cp) will not be updated. Should fix dupes that can happen when a intermediary save fails because of sql access being down.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14949 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-30 20:16:23 +00:00
Skotlex
5b4c84d286 - Rewrote/updated the SC_COMBO logic. Got rid of state.combo and added usage of packet 0x7e1 (PACKET_ZC_SKILLINFO_UPDATE2) to report skill inf changes.
- Cleaned up a bit the function clif_setlevel (these functions should be as lightweight as possible...)
- Fixed the server sending twice the skill tree during login.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14939 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-23 17:30:08 +00:00
ai4rei
7662f1e897 * Fixed monsters above Lv99 displaying a Lv99 aura (bugreport:3986).
- The server no longer caps the level sent to the client by default.
- Servers that require the aura to be displayed at a level different from lv99, either have to alter the client or adjust the 'client_limit_unit_lv' setting.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14938 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-21 23:24:50 +00:00
ai4rei
9b7854c898 * Added quick validation of guild emblems' bitmap format to prevent forged emblems, that cause the client to crash, from being accepted (thx to sinya for a sample).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14937 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-20 06:10:43 +00:00
Skotlex
81ce878498 - Oh, forgot to make unitwarp support the mapname "this"
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14934 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-11 15:56:30 +00:00
Skotlex
a3d1ad027f - Fixed the add_drop code breakage which ocurred after adding support for SP_ADD_CLASS_DROP_ITEM. There's probably a bugreport for this, but the website is also broken currently :3
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14933 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-11 15:50:44 +00:00
ai4rei
d162c70ef5 * Added support for cash shop packets without kafra points for clients 2007-07-10aSakexe and older (bugreport:4701, related r10888 and r11548).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14932 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-11 02:56:17 +00:00
Skotlex
ac41a46e44 - added sending a dummy 0x08b9 packet in the char-server, required to support clients from this year.
- added a fix to status_heal to take into account that -int_max == int_max in some architectures, which leads to an infinite loop (bugreport:3410)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14930 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-10 16:53:47 +00:00
Skotlex
b7ad7aa055 - Commiting a bunch of cleanups piled up from the past few weeks/months/years.
- Updated unitwarp so that an id of "0" causes the script's rid to be warped.
- Updated the Brasilis ontouchNPC warp command to use unitwarp instead.
- Signum Crucis's duration is now specified in the skill_cast_db file
- Updated @warp/@jump commands so that when an invalid tile is specified, a nearby cell is chosen (rather than using a map-wide random value)
- The if(req.weapon) code was broken, since req.weapon is never "0" for a skill. Updated the code so that the requirement of '99' (any weapon) is stored as 0, in order to make the checks effective.
- Cleaned up the code for script command warpparty
- Fixed the define itemdb_canrefine()
- Cleaned up some the status_damage() function
- Fixed map_random_dir(), which at times would pick cells that didn't preserve the required distance.
- Some aesthetic code cleanups.
- Fixed some possible crashes for skills where the code assumes the caster is a player.
- Fixed a bunch of idiotic code-snippets that should have embarrassed whoever was responsible for them.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14929 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-10 15:52:59 +00:00
L0ne_W0lf
70e1ec52a5 Minor item-related updates, and a couple quest database updates.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14926 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-07 14:55:43 +00:00
ai4rei
367ab9727d * Added missing fields to guild belong info packet 0x16c (ZC_UPDATE_GDID).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14925 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-08-06 15:43:17 +00:00
ai4rei
bb9d066877 * Fixed quest saving checking only the first 3 objectives for changes regardless of MAX_QUEST_OBJECTIVES (follow up to r14800, since r13973).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14924 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-31 08:34:51 +00:00
flaviojs
a39699098f * CMake: Added options BUILD_TXT_SERVERS, BUILD_SQL_SERVERS, BUILD_MAPCACHE.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-22 14:54:37 +00:00
flaviojs
1cae2ede8e * Missing deletion from r14918.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14919 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21 07:42:21 +00:00
flaviojs
bdfa11d86e * CMake: Only install template files if they don't already exist.
* CMake: Added plugin targets.
* CMake: Added options BUILD_* to build the converters and individual plugins. (default=OFF)
* CMake: Added option WITH_CPACK for package creation. (default=ON)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21 06:47:12 +00:00
flaviojs
b8704518db * Made GCOLLECT use it's debug functions.
* Turned off garbage collection for GCOLLECT since there's nothing to do with explicit frees.
* Added malloc_verify_ptr/malloc_usage code for all memory libraries.
* Added malloc_memory_check for debug purposes, tests memory for errors and memory leaks.
* Added explicit memory check on malloc_final.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14917 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-20 22:23:13 +00:00
ultramage
13511f4ea9 Removed malloc's Atomic (-A) function macros (see r968, changelog 01/20). They were specific to the GC allocator (atomic = promise to not have any pointers to other things inside = will be skipped during Mark phase), serving as a (dubious) optimization trick - which could cause GC to malfunction if used incorrectly.
Simplified GC's CALLOC, since the GC docs say GC_MALLOC automatically clears memory.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14916 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-20 12:24:56 +00:00
flaviojs
4369fa70e9 * Made NO_MEMMGR only be set as a default value, allowing for simultaneous use with the memory libraries.
* Moved memory library selection to malloc.c to avoid poisoning the namespace of the rest of the code.
* Removed BCHECK code since it's unneeded. (bcheck is an external batch tool that runs on top of the dbx debugger)
* Fixed GCOLLECT usage. (missing init and final memory leak check)
* Fixed DMALLOC usage. (missing options on CYGWIN and verify memory)
* Renamed malloc_verify to malloc_verify_ptr to avoid conflict with DMALLOC.
* Changed itemtype from inline to static inline to avoid error with the SunOS compiler.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14913 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-19 04:12:30 +00:00
flaviojs
305dc5421a * Changed the warning message of when setrlimit fails to be more explicit.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14907 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-15 06:16:51 +00:00
L0ne_W0lf
d05e97b7a1 Tweaked the sealed shrine entrance NPCs. Hopefully the damn thing works now.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14905 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-13 18:01:07 +00:00
flaviojs
13a4063735 * CMake: added search for math.h, added search for socket/nsl library. (tested with Solaris-201011-x86)
* Added missing include to socket.c.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14903 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-12 22:01:45 +00:00
flaviojs
9535126f93 * CMake: set project language to C, added module FindFunctionLibrary, added search for dl library. (tested with debian-wheezy-i386)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14902 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-12 06:39:46 +00:00
L0ne_W0lf
02179c24bb * Added bonus3 bAddClassDropItem, care of Epoque.
- Added several missing items to the item database, updated others.
- Raised level 10 Dec. AGI to be level 48, when used by mobs.
- Added missing mercenaries to the mercenary DB, and skills.
- Added missing monster_chat_db entries for Nydhoggr's Shadow.
- Added Brasilis pets to the pet DB, these pets are unhatchable on purpose.
- Added additional quests to the quest_db, mostly for RE.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14901 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-11 20:13:22 +00:00
flaviojs
334afd6cf6 * CMake: added txt-converter targets, added warning for 64bit, added list of available targets.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14900 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 23:46:51 +00:00
flaviojs
7fe7c8d9cb * Changed limit definitions used in WBUF* and WFIFO* to the intended fixed size alternatives.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14899 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 16:00:14 +00:00
flaviojs
2ca6ba676f * Temporary fix for bugreport:4961 (unintended conversion from signed to unsigned).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14896 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 13:28:49 +00:00
ai4rei
4d6e77c875 * Added script command 'getmercinfo' for retrieving information about a mercenary of an online character.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14894 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-09 18:45:22 +00:00
flaviojs
31cbbf1917 * CMake: added search for math library, made CPack existence optional, updated the search for mysqlclient and corrected misspelled variables (tested with FreeBSD-8.2-i386)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14893 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-09 07:39:27 +00:00
ai4rei
ac908248b5 * Removed duplicate entries for Gunslinger and Ninja in msg_athena.conf (since r5506).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14892 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-09 07:00:53 +00:00
ai4rei
8a08767917 * Replaced compress/uncompress inline code (encode_zip/decode_zip) with the respective zlib library calls while keeping 3rdparty calls inside common code (follow up to r14888, related r14808).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14891 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-07 09:31:43 +00:00
flaviojs
7e4a0b3266 * CMake: normalized variable names, added ability to create a package/installer.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14890 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-07 03:21:42 +00:00
flaviojs
9be2d9dbbd * CMake: src/common builds static libraries common_base/common_sql, that are used as dependencies by the other targets.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14889 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-06 20:40:38 +00:00
flaviojs
0394156c54 * Merged decode_zip/encode_zip from eapp's grfio to replace our direct use of zlib's uncompress/compress.
* Fixed strict-aliasing warning in mapcache's GetFloat.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14888 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-06 19:36:18 +00:00
flaviojs
612e016e59 * Changed grfio.c include order and moved zlib include from the header to the source.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14887 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-06 18:39:57 +00:00
flaviojs
9ef5902840 * CMake: split txt and sql variants of login-server and map-server.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14886 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-05 20:51:08 +00:00
ai4rei
8da289c02a * Fixed 'strnlen' still causing warnings in db.c on Debian (follow up to r14855).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14885 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-04 18:22:24 +00:00
ai4rei
442f27c128 * Corrected npcdb_checkid to exclude border constants 400 (JT_NEW_NPC_START) and 1000 (JT_MON_BEGIN) (since r4425 and r12025, related r4537).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14882 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-03 06:45:13 +00:00
ai4rei
2c1290cae2 * More instancing updates.
- Improved instance_id validity checking.
- Fixed instance name being copied with memcpy rather than safestrncpy (since r13901).
- Removed unused instance data field 'progress_timeoutval' (since r13901).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14879 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-02 12:07:32 +00:00
ai4rei
b91aa20b3d * Random updates to instance system.
- Introduced a constant for instance name length.
- Corrected comments related to instance packets 0x2cb (ZC_MEMORIALDUNGEON_SUBSCRIPTION_INFO) and 0x2ce (ZC_MEMORIALDUNGEON_NOTIFY).
- Moved instance finalization out of map.c into instance.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14878 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-02 10:33:38 +00:00
flaviojs
0a7528681e * CMake: marked executables as different components and other miscellaneous changes. [FlavioJS]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14877 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-01 15:43:58 +00:00
ultramage
fa5015a913 Removed extra guards around cbasetypes.h include lines, since they give no performance improvement.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14876 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 15:27:36 +00:00
ultramage
8a123381c6 Reimplemented integer typedefs in cbasetypes.h in terms of standard ones in stdint.h.
Used the INT*_C() macro to give the MIN/MAX constants a proper size suffix.
Merged the 64bit integers section with the main integer section.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14875 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 14:26:36 +00:00
ultramage
2f07f03a5a Added back intptr/uintptr typedefs for backwards compatibility.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14874 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 10:32:30 +00:00
ultramage
edcb998d59 Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-30 09:14:21 +00:00
flaviojs
27799f566d * Added experimental support for CMake. (for now: basic build, no extras, only tested with VS10 and cygwin)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14872 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-29 12:26:51 +00:00
flaviojs
f4d8ec2ff0 * Added common/random and 3rdparty/mt19937ar to project files, makefiles and configure script.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14870 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-27 01:47:06 +00:00
ai4rei
2ca000132b * Fixed a signed literal being assigned to an unsigned variable and other minor cleanups in malloc (bugreport:4765).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14869 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-26 16:05:07 +00:00
ai4rei
d98c0e77cd * Fixed @mobinfo displaying mvp rewards with 'AegisName' although normal drops use 'Name' item db column (bugreport:4981, follow up to r6346).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14868 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-26 15:43:44 +00:00