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
flaviojs
b02133b422
* Merges from charmerge:
...
- Added DBMap::exists. (r14090)
- Added sv_parse_next, a stepped version of sv_parse (delim-separated parser). (r14100 r14104)
- Added missing fd check to do_close. (r14145)
- Normalized, refactored and restructured some code (in preparation for shutdown/reconnect code). (r14145 r14150)
- Changed the char select request code to allow the char-server to reject it. (player in map-server trying to go to char select) (r14150)
- Added shutdown support to the servers. (incomplete) (r14152)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14851 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-16 10:22:35 +00:00
ai4rei
dd1cc7c836
* Fixed pet's equip would visually disappear when it's walk speed was changed while it was standing (related r14838).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14847 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-13 15:31:47 +00:00
ai4rei
36fd8bcf19
* Added support for new skill usage notification packet 0x7fb (ZC_USESKILL_ACK2).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14845 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-11 18:23:06 +00:00
ai4rei
bb48f685e7
* Fixed party invite packet 0xfe (ZC_REQ_JOIN_GROUP) using account id of the inviter rather than party id.
...
- Added support for new party invite packet 0x2c6 (ZC_PARTY_JOIN_REQ), introduction date guessed.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14844 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-11 16:08:44 +00:00
ai4rei
0eb61f5a95
* Fixed a crash in clif_parse_FriendsListAdd, when a player is added that is not online (bugreport:4947, since r14835).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14843 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-06-03 03:18:30 +00:00
Inkfish
213ff7ff38
Fixed a typo in buyingstore_create.
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14842 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-31 11:43:19 +00:00
ai4rei
9e4d7a1beb
* Fixed script command 'warpguild' looking for an attached player even when it is not needed (bugreport:4941, since r2674, related r14840).
...
- Documented special map names recognized by the command.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14841 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-30 19:24:02 +00:00
ai4rei
ce70d39dbc
* Fixed script command 'warpparty' looking for an attached player even when it is not needed (bugreport:4359, since r14311, related r2674 and r5592).
...
- This also resolves an issue, where the command fails when the attached player is on a map that has noreturn or nowarpto mapflags set.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14840 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-30 19:00:43 +00:00
ultramage
dd22261936
Renamed clif_parse_ReqFeel to clif_feel_req (since r4352).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14839 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 18:30:23 +00:00
ai4rei
982ce2323c
* Fixed pets' speed would not get updated to normal, after they finished running to their owner (bugreport:1304).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14838 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 16:07:22 +00:00
ai4rei
4356e5fdbc
* Fixed NULL pointer in status_change_timer (SC_BERSERK), when the HP subtraction causes the HP drop below 100, but does not exceed remaining HP (bugreport:1150, related r8705, r11786 and r12061).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14837 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 13:43:51 +00:00
ai4rei
aa0bf03f74
* Updated script commands 'npcshopitem', 'npcshopadditem' and 'npcshopdelitem' to support cashshops as well (bugreport:4928).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14836 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 12:41:16 +00:00
ai4rei
8325f3518f
* Fixed players could add themselves to their friendslist through their clones or WPE (bugreport:4909).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14835 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 12:31:12 +00:00
ai4rei
0bbca2a6aa
* Fixed bonus 'bHPDrainValue' on left hand would work as right hand bonus, when specified with 'bonus' rather than 'bonus2' (bugreport:4939, since r6221).
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14834 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-29 12:09:02 +00:00
brianluau
1c0abe84ef
- Fixed a possible exploit in guild castle investment. (bugreport:4929, topic:272783)
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14833 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-24 07:59:43 +00:00
brianluau
177342ad2b
- Fixed some bugs in Cursed Spirit quest. (bugreport:4926)
...
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14832 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-24 04:55:02 +00:00