497 Commits

Author SHA1 Message Date
brianluau
a11e789e0a - Fixed some typos in the script command documentation. (bugreport:2547)
- Fixed a misleading message in the custom Job Changer. (bugreport:682)
- Updated some NPC's facing directions. (bugreport:3030)
- Added missing newline in some ShowWarning(). (bugreport:2940)
- Fixed SC_BOSSMAPINFO time being off by 1 minutes (bugreport:3035)
Now, the seconds are rounded up to the next whole minute.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-05-02 20:23:30 +00:00
FlavioJS
653ddafa5c * Fixed safestrncpy trashing the memory before dst when n == 0. (since r10667, bugreport:2996)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13681 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-20 17:28:48 +00:00
FlavioJS
768ceda5e9 * Took care of some warnings. (marionette formulas and *INTPTR_* macros)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13670 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-12 13:39:15 +00:00
FlavioJS
e7607efb6c * Removed online_check config options. (always active now)
* Clarified char_maintenance config option.
* Changed packet 0x2712. (added request_id)
* Changed packet 0x2713. (added sex, request_id, version, clienttype; removed email, expiration time, gmlevel)
* Delayed user count check and mmo_char_send006b to when the account data arrives.
* Created auxiliary function MD5_Salt.

(split from a future commit that was getting to big for my taste)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13652 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-04-01 22:39:19 +00:00
ultramage
35155f1333 Corrected a potentially uninitialized variable in sv_parse (bugreport:2860).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-03-13 08:18:30 +00:00
FlavioJS
14cbb64848 * Wrong variable being used in StringBuf_Vprintf. (follow up to r13386, fixes bugreport:2798)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13548 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-25 16:15:09 +00:00
ultramage
c2cc0763d9 Increased variable size for status/skill points to remove the 65k cap (bugreport:1579).
Added sql upgrade script to adjust the appropriate char table columns.
This is an enhancement to r5762.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13541 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-20 19:47:17 +00:00
FlavioJS
8326096602 * Modified WFIFOSET to trigger a fatal error when trying to send a packet that is too big.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13539 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-02-20 05:53:50 +00:00
FlavioJS
672dbf2946 * Added a limit of 1MB of pending data in the write fifo for non-server sockets. Connections that go over the limit are closed.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13469 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21 15:18:51 +00:00
FlavioJS
69720a42bf * Replaced the fake timer heap (sorted array) with a real heap. (improves performance)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13465 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21 01:21:24 +00:00
FlavioJS
013d104eff * Added a generic binary heap implementation based on defines. (round 2)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13464 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-21 00:35:33 +00:00
FlavioJS
d60b27d27d * Added a generic binary heap implementation based on defines.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13462 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-20 21:14:13 +00:00
FlavioJS
e478e97941 * Added client login packets 0x01fa and 0x027c.
* Other minor cleanups.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13449 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-14 14:03:06 +00:00
ultramage
09be248ca5 Fixed Sql_SetEncoding() returning SQL_ERROR when it succeeds and vice versa (thanks to Rail for noticing it).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13447 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-13 15:44:47 +00:00
FlavioJS
e64c3496a8 * Cleaned up command @users/#users:
- displays everything on the target user (self for @users)
- uses a static array instead of a temporary DBMap
- displays percentages with precision of 0.01%
- uses safesnprintf instead of sprintf

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13446 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-13 12:53:11 +00:00
ultramage
578532f577 Moved the 'changed' mailbox flag from shared mmo.h to mapserver-only.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13433 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-05 15:34:09 +00:00
FlavioJS
7263ae4f45 * Extended sv_escape_c to escape '\a','\b','\t','\v','\f','\?' characters to their respective representations instead of octal.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13414 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-12-25 22:05:16 +00:00
FlavioJS
1ddbd85a25 * Fixed a va_end using the wrong variable. (from r13383, fixes bugreport:2483)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13386 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-24 18:21:59 +00:00
FlavioJS
7ae74b588b * Hunted down improper uses of va_list variables.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13383 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-22 23:54:34 +00:00
FlavioJS
72542d65cc * Hunted down the simpler 64bit pointer truncations.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13380 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-22 15:44:17 +00:00
zephyrus
c830a56da3 - Item Rental System.
Script Usage:
- rentitem <itemid>,<seconds>;
- rentitem <itemname>,<seconds>;

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13370 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-11-16 16:14:30 +00:00
L0ne_W0lf
02e80513d3 * Updated mmo.h, increased merc max count to 36.
* Fixed save crash related to non-guilded mercenaries.
* Removed job and level restriction on Mercenary ASPD potions.
* Added Monster Mercenaries using mobs original stats.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-04 23:41:59 +00:00
zephyrus
3fd4ec074a - Something i forget to commit mmo.h.
- Preparatives for Faith/Calls/Kills for mercenaries.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13167 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-01 00:45:56 +00:00
zephyrus
6a1de57730 - A proper mercenary lifetime calculation.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13165 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-31 22:56:05 +00:00
zephyrus
be66dce771 - Fixed skill problems (who did this? Mercenary skills values are big than homunculus).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13124 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 16:02:26 +00:00
zephyrus
399efe15bd - Completed Mercenary Create, Delete, Save. Tests OK.
- Incremented MAX_SKILL required for a proper load of Mercenary Skills.
- Some fixes.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13118 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 19:08:54 +00:00
zephyrus
1204fd49db - Mercenary Packets (Server to Client). Still need a little more info.
- Packet for Mercenary Menu.
- Some other progress as creation but need more code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13116 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-23 13:09:50 +00:00
zephyrus
4ca3bd6ce3 - Mercenary data structures.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13110 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-22 18:53:11 +00:00
ultramage
e3d39453fd * Fixed a storage saving issue with txt charserver (bugreport:2084)
- caused by incorrect idb_ensure -> idb_get change (see r12950)
- removed redundant account_id variable from storage data
- cleaned up the very messy txt storage handling code

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13093 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-19 16:00:30 +00:00
ultramage
104f28b34b Fixed login printing raw passwdenc passwords to console (bugreport:826).
Added strlib function bin2hex().
Cleaned up the md5calc interface a bit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-09 13:05:54 +00:00
ultramage
5033b0f675 Reverted r12230. cUSTOM_CFLAGS is redundant since you can achieve the same result by setting CFLAGS.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13022 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-31 06:08:07 +00:00
ultramage
582c36c11e Renamed struct 'skill' to 's_skill' to remove naming collisions.
Added defines for mercenary skill ranges.
Added a mapping of mercenary skills to the skill db (700-799 atm).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13012 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 08:19:07 +00:00
ultramage
6fd34c5052 Fixed Sql object not initializing default values properly.
Fixed Sql_Free producing timer deallocation errors when called without first establishing a database connection.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13011 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-29 07:59:27 +00:00
ultramage
8fed0c403c * Removed some leftover code that shouldn't have been merged
* Possibly corrected a guild saving problem (bugreport:1908)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-27 07:07:20 +00:00
ultramage
106b44c1e7 Merged the /loginmerge branch (topic:192754)
* the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 20:45:57 +00:00
ultramage
19d4559ab6 Partially reverted the timer code changes from r12926 - r12969.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12999 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-26 20:13:41 +00:00
FlavioJS
cb565d9d45 ops ('|'->'&' in delete_timer debug code)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12969 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-20 02:36:23 +00:00
FlavioJS
99a1aaa9e1 * Simplified the search in pop_timer_heap and added more debug info to help determine the source condition of timer errors. (bugreport:1860)
* Fixed crash in skill_castend_id. (bugreport:1860)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-20 01:16:59 +00:00
FlavioJS
3f7b407d6d * Added a check to make sure only released timers are acquired from the free list.
* Changed TIMER_MAX_INTERVAL to 1 second (was set to 1 minute by mistake).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12963 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-16 10:34:16 +00:00
FlavioJS
47ee54852d * Fixed pop_timer_heap using max heap comparisons instead of min heap comparisons and protected timer functions against improper use. (should fix bugreport:1833 bugreport:1841)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12956 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-15 01:41:49 +00:00
ultramage
4546c7fc0a Modified storage data loading
* storage is now loaded/saved along with character status
 * as a consequence, a lot of storage handling code was removed
 * there is no more locking done within storage data
 * mapservers no longer cache the data (solves muiltimapserver exploit)
 * loading storage on char select may decrease charserver performance

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12950 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-13 16:14:32 +00:00
ultramage
bfd5397913 Renamed 'storage_' to 'items' in the storage_data structure.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12933 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 08:42:41 +00:00
ultramage
a35279667d Renamed 'struct storage' to 'struct storage_data' (to make 'storage' available as a variable name).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12932 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-10 08:27:03 +00:00
FlavioJS
cdda61ce1b * Added const to the return value of get_timer.
* Added a maximum timer interval. Avoids server shutdowns being delayed for ~10 seconds under some circumstances on windows.
* Replaced the fake timer heap (ordered array) with a binary min heap.

(actually, this is just a merge and has been in use for months)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12926 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-09 01:25:19 +00:00
ultramage
290ca7eec3 Fixed a bug in the timer code which made it impossible to delete a timer with id '0' (since pre-svn, still present in jAthena).
Fixed wrong order of parameters in a ShowWarning call when freeing a locked DBMap, which caused a segfault when executed (since initial implementation in r4859).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12854 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-18 10:59:40 +00:00
L0ne_W0lf
4ba16a2c0d Forgot to commit source modification from r12833 (Updated Novice grounds.)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12844 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-17 12:27:39 +00:00
FlavioJS
2fdf093539 * Made the socket limit not be set in cygwin, which has bogus behavior. (bugreport:1684)
* Made the socket limit be set to the maximum allowed value when setting to FD_SETSIZE fails.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12839 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-16 05:07:56 +00:00
FlavioJS
625f9f62fd * Added support for skill names to script commands:
- skill, addtoskill, guildskill, getskilllv, getgdskilllv, itemskill, petskillattack, petskillattack2, petskillsupport, skilleffect, npcskilleffect, unitskilluseid, unitskillusepos
- bonus/bonus2/bonus3/bonus4/bonus5 for bonuses bAutoSpell, bSkillAtk, bSkillHeal, bAutoSpellWhenHit, bAddSkillBlow, bCastrate

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12814 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-12 09:30:12 +00:00
FlavioJS
c9a3dc80bf * Added experimental code to set the socket limit at runtime.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12803 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-06-09 23:44:52 +00:00
ultramage
2ecdab9606 Moved the options to disable specific compiler warnings from the generic 'AdditionalOptions' to the appropriate 'DisableSpecificWarnings' section.
Corrected an ancient mistake in the grfio/zlib code (calling inflateEnd in case of an error during the Deflate process).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12726 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-26 12:16:53 +00:00