8910 Commits

Author SHA1 Message Date
L0ne_W0lf
f235ec59cb Of all the things to have typo'd...but hey, at least I'm consistent. I've been spelling 'nest' as 'next' since I started working on it.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14910 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-16 21:02:28 +00:00
L0ne_W0lf
470a089218 * Have been working on this for months: Added Nidhoggr's Nest instance.
* Tweaks to how checkquest is used in orc's memory and sealed shrine.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14909 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-16 19:23:36 +00:00
flaviojs
cf819cc321 * CMake: added tests for big endian, typecast to union and monotonic clock.
* CMake: added 'have function' tests for setrlimit, strnlen, getpid and gettid.
* CMake: added option ENABLE_RDTSC.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14908 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-15 06:27:35 +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
d725299ad1 * CMake: added search for ws2_32 library. (tested with MinGW/MSYS)
* Added missing pcre library for MinGW.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14904 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-13 01:58:32 +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
b13fa85a3f reverting unintended change in r14897 (3rdparty line removed)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14898 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 15:48:40 +00:00
flaviojs
e3dc463655 * CMake: lowered required version to 2.8.3 and moved custom cmake modules to 3rdparty/cmake.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14897 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-10 15:29:57 +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
7cb94965db * Fixed minor stuff in login/char converter VS6 project files (since r14858).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14880 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-02 13:41:17 +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
ultramage
d480c27293 Fixed quest index memory corruption when adding new quests (since r14039, bugreport:4982).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14867 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-26 15:04:47 +00:00
ultramage
e69f094b30 Slightly cleaned up some ancient Brandish Spear code:
* remove helper 'struct square' from common/mmo.h
 * moved skill_castend_nodamage_id's case ML_BRANDISH to separate function

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14866 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-25 23:21:24 +00:00
flaviojs
161a499c76 * Added Mersenne Twister MT19937 as a random number generator.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14865 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-25 22:09:35 +00:00
flaviojs
762dcdc316 * Made chrif_save always call pc_makesavestatus. (no reason to prevent the call, and was interfering with multi map-server; fixes bugreport:1400)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14863 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-23 19:49:17 +00:00
ultramage
d4a24e017e Plagiarized skills are now removed on jobchange (bugreport:4973).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14862 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-22 21:02:46 +00:00
ultramage
8229284b40 Added enum e_skill_flag to represent the values of struct s_skill's complicated 'flag' field.
Reordered the enum values so SKILL_FLAG_REPLACED_LV_0 goes last and arithmetic can be done on it safely (for storing skill level values). This also adds support for skill levels higher than 10.
Fixed several places where SKILL_FLAG_TEMPORARY was not handled properly, and instead was considered as one of the saved skill level values (resulting in skill level -1).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14861 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-22 20:11:48 +00:00
ultramage
b39ddf66ff Fixed the order of mapindex and md5calc files in visual studio projects (mistake in r13728 and r13729).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14860 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-21 17:41:30 +00:00
ai4rei
d3d2003fea * Fixed various sorts of issues with VS6 project files (since r6929, follow up to r14466 and r14638).
- Debug configuration was missing and release had _DEBUG defined (indicates debug configuration).
- Login-server (SQL) defined PACKETVER=6 (overrides mmo.h).
- Warning Level was 2, which hides a lot of actual errors.
- Added projects for mapcache and TXT converter.
- Removed references unneeded/obsolete libraries/source files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14858 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-19 13:44:52 +00:00
ai4rei
cdd5ade6f0 * Fixed using @refresh while having vending or buyingstore open would stuck the character (bugreport:156 , since r1307).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14857 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-18 16:08:50 +00:00
ai4rei
81c8c18b57 * Fixed missing strlib.h include for compilers without own 'strnlen' implementation (since r14853).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14855 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-18 10:13:19 +00:00
ultramage
170e322ccc Moved DBMap's string maxlen parameter translation (0 -> UINT16_MAX) to its initialization phase, so that it runs once instead of on every hash and compare step. This will slightly speed up most strdb operations.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14854 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-16 17:36:53 +00:00
ultramage
7861584d59 Fixed DBMap's db_dup_key to allocate only as much as necessary (bugreport:4969).
This reduces default eA's memory usage by about 400kB.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14853 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-16 17:01:09 +00:00
flaviojs
ccb0bdde68 Fixed char-converter not being able to compile due to both char.h being included. (caused by last commit)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14852 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-16 14:02:37 +00:00