22 Commits

Author SHA1 Message Date
zephyrus
5954733c85 - Moved char server's mercenary code to a different file (int_mercenary.*)
- New Sql Patch for create mercenary_owner DB.
- Removed mer_id from char_db.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13166 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-09-01 00:03:10 +00:00
ultramage
85019ebcf3 Corrected project files / makefiles that were missing newly added .c file entries.
Corrected a leftover _RJ setting in the vs6/vs7/vs8 txt login server project files.
Reformatted the converters makefile.
Added a crude vs9->vs8 project file converter to /tools.
Synchronized vs8 project files using the converter tool.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13043 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-04 11:25:28 +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
Kevin
302adbf42a Major updates to the quest system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-13 22:19:02 +00:00
Lupus
41fb9def54 reverted back project files. due to incompatibility. The working directory has been added to VS9 only
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12398 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-19 11:10:42 +00:00
Lupus
e5e829ab8a updated VS project files. You can run servers trough VSudio IDE / Run
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12390 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-18 07:01:20 +00:00
zephyrus
284334b4f0 - Merged Auction Search and Register. It seen to work fine, so you can test those.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12301 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-05 17:09:47 +00:00
zephyrus
c34325a53b - Added the new mail system. Requires optimization and tests.
- Updated the maildb sql structure.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11548 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-22 20:38:26 +00:00
FlavioJS
65642f6f1c * Merged the tmpsql branch:
- Abstraction for the sql code (sql.c/h).
- New configure script and makefiles.
- Restored txt zeny logging code. (r10814)
- Rewrote mapserver's sql code - itemdb, mobdb, mapreg, logs. (r10814)
- Fixed a precedence issue (&& and ) in char_sql/char.c. (r10833)
- Improved db reading code a bit for consistency. (r11077)
- Added separate atcommand for mail deletion. (r11077)
- Corrected a few messages that said "new" instead of "unread". (r11077)
- Broadcast (*) messages now use "*" as the target's name (not ""). (r11077)
- Moved StringBuf code from utils.c/h to strlib.c/h. (r11084 r11117)
- Some misc login server cleanups (reformatting etc). (r11136)
- Corrected/modified some header entries. (r11141 r11147 11148)
- Adjusted VS project files. (r11147)
- Adjusted the way the sql charserver does item saving. (r11192)
- Corrected usage of reserved keyword 'friend' in mmo.h. (r11192)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11245 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-20 11:09:36 +00:00
ultramage
74295231e6 * Discarded extra deflate function needed for afm reading
- as a result, discarded the whole chain of support functions, .c files and includes needed to make that one function run
- also removed zlib compile/link dependencies where they are not needed
- reduced the whole zlib package into two core include files
- adjusted makefiles / project files to reflect this change 

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10273 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-17 10:03:30 +00:00
ultramage
99fb323a0a Fully removed the msvcr80.dll dependency from the vs8 project files
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10118 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-02 08:35:41 +00:00
ultramage
158609d145 Changed the vs8 used crt library to static linking
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10070 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-26 00:02:57 +00:00
ultramage
cb3e3fd4f9 Major reconfiguration of the vs7 project files (+vs8 while I was at it)
- added definitions _DEBUG and NDEBUG to tune system-specific stuff
- reduced the build requirements (Pentium 4 was a bit too much)
- changed build settings and project structure to match the vs8 projects
- corrected some vs8 inconsistencies

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10055 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-22 21:37:51 +00:00
FlavioJS
083fc86437 - Changes in the VS8 project files:
* synchronized the settings between the projects
  * joined all .h and .cpp files and grouped them based on the src subfolder (easier to understand how the source is organized)
  * added Debug/Release build targets that build txt/sql only
  * other minor changes

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9758 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-01 16:59:50 +00:00
ultramage
7390d2d950 Removed graph, httpd and webserver
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9757 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-02-01 01:33:37 +00:00
ultramage
59b38494b7 - Major reconfiguration of the trunk VS8 project files, read the changelog for details
- Also removed some deprecated code that was causing linking conflicts
- And fixed a missing md5calc reference in stable's VS8 files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9619 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-05 15:57:01 +00:00
FlavioJS
60e3d1b499 - Applied part 1 of TheUltraMage's socket cleanup.
"Basically what I did was perform simple one-liner substitutions for ugly repetitive blocks of code. The most apparent are the send/recv code and the other basic socket calls."
- flush_fifo is non-blocking now. I guess best effort is good enough...
- Copied header files from vcproj-7.1 files to vcproj-8 files.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9570 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-25 06:59:25 +00:00
FlavioJS
15258dfdb0 - Moved md5calc to common
- Answered Skotlex's question and fixed "warning: comparison is always false due to limited range of data type" by restricting script words to ASCII characters only.
- Applied "svn:eol-style native" to makefiles and project files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9544 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-21 01:16:30 +00:00
DracoRPG
a2c64b8d1e Skill lv up fix
Manually updated VS8 char_sql project

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7710 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-17 07:40:12 +00:00
Lance
530767d5e1 git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7045 54d463be-8e91-2dee-dedb-b68131a5f0ec 2006-06-08 13:49:31 +00:00
Zido
a71840da35 Added an update by ALZ. Refer to changelog.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6079 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-15 15:02:21 +00:00
Valaris
2178a86317 AS OF SVN REV. 5901, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5094 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:10:48 +00:00