42 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
zephyrus
c5cc2257d3 - Moving all content of Homunculus code to a proper file Homunculus.c/h
- Update of all project files.

NOTE: All functions on homunculus.c should be renamed i think, to remove all the merc_*.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13122 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-24 15:00:26 +00:00
ultramage
dcc2cdb5da Split off mapreg code from script.c
* new mapserver files, mapreg.h, mapreg_txt.c, mapreg_sql.c
 * removed MAPREGSQL from project files / makefiles
 * mapreg storage engine is now fully dependent on the server type
 * added config settings mapreg_txt and mapreg_db to inter config
 * added get_str() function to complement add_str()
 * fixed txt mapreg code allowing too long variable names

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13081 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-08-15 11:14:45 +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
54dc1c0f1a Removed the IRC bot system, now a customization (see topic:194306)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13014 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-30 02:24:04 +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
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
Kevin
9bcdb353a4 More questlog code.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12556 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-11 01:38:41 +00:00
ultramage
c72d39ae5b Reverted my recent changes to trunk.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12493 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-05 12:33:02 +00:00
ultramage
24989df4ce Added login.c to hold most of the common functionality of the login server.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12479 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-04 20:07:53 +00:00
ultramage
6148165707 Preparations for the login server TXT/SQL merge
- copied the sql login server code to /src/login
- merged the login server header files
- moved the account savefile name config setting to inter_athena.conf and renamed it to match the other settings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12478 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-04-04 17:07:31 +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
ultramage
093445cfe6 Disabled some compilation warnings for VS7 and VS8 mapserver builds (bugreport:1192)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12376 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-16 10:50:54 +00:00
ultramage
8b00f6dbdd * extended the "npc_event: event queue is full" error message to also print the name of the event (so that the cause can be tracked down)
* removed a strange (and undocumented) event name check for "GM_MONSTER" in the npc event execution code
* added effects from recent sakexes to effects list
* removed ladmin from vs8 sql builds
* added int_auction.c/.h to vs6 and vs7 project files
* some small cleanups

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12362 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-14 12:59:02 +00:00
ultramage
b3b275f24f Path code cleaning...
* Added map/path.h, moved path-related function headers to path.h.
 * Removed the macroed _real() path functions.
 * Modified some functions to use boolean return values instead of 1/0 or 0/-1.
 * Modified path_search_long() to allow a NULL output pointer (in which case a temporary local buffer will be used instead).
 * Removed an unused ->path_half member variable from struct walkpath_data.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11958 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-22 13:00:48 +00:00
ultramage
ea5212c5a8 * TXT/SQL login server code synchronization
- exported several core structures to login.h
- split off ladmin communication code from the TXT login server
- removed all occurences of login_log(); a unified function should be added when SQL's loginlog_db logging code gets synced with TXT
- removed conf setting login_log_filename
- fixed ladmin getting timeouts since the ping system was changed
- removed login/char server_fd[] arrays, added server[].fd instead

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11826 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-27 19:38:16 +00:00
ultramage
d091f1cf05 * Cleaned up some messy guild code (more to come)
* Cleaned up the mail code, no more pointless dynamic allocation
* Added upgrade_svn11548.sql to convert the mail table to new format
* Updated vs7 and vs6 project files
* Increased the max. send buffer size to 5M since 1M is not enough
* Please complain if something stops working ^^;

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11571 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-24 12:14:18 +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
69924c6949 Some more project file changes (fixes compilation problem)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10274 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-17 10:22:07 +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
c11d18be16 Removed charsave from projects (used old data for the previous commit, sorry)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10056 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-22 21:42:21 +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
ultramage
9579515cb9 - Removed the old 'mapserver charsave' mechanism
- Fixed some wrong sql login logic
- Fixed some compiler warnings, cleaned up mapserver sql-related vars

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10027 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-18 22:43:41 +00:00
Lance
66c7c0d040 Added missing VC++ 7.1 project files for mapcache.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10024 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-18 09:50:57 +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
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
Lance
26500644dd * Optional macro MEMSET_TURBO for faster low-level memory initializations.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8499 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-27 06:38:17 +00:00
skotlex
b7ef9a3032 - Updated vc-project files to compile with the new int_homun files.
- Hopefully fixed the crash when using charsave_method = 1


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8302 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-15 21:25:52 +00:00
DracoRPG
15dd140846 Orn's and Albator's Homunculus system, finally, YAY!!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7706 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-17 00:15:33 +00:00
Lance
40f2aa9cc5 * [Added]
- Visual Studio .NET 2003 includes for mercenary.c 
* [Fixed]
- Logic error in NPC custom AI in unit.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6853 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-30 17:11:55 +00:00
Lance
bdac5d6c09 [Optimized ]
Removed unused variable (account_id) in storage_guild_storagesaved.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6815 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-05-29 10:12:26 +00:00
Lance
458f135cd7 * Temperory fixed compiler warnings/errors. Please compile before commiting. [Lance]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6098 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-04-16 02:40:46 +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
Lance
14fe8c03e8 * Refixed the fix with a constant list for Win32 users - limits.h (imported from MSVC)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5769 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-27 13:23:53 +00:00
Lance
b8116f49db * Minor cleanups.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5712 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-23 07:08:31 +00:00
Lance
fc71db55ba * Fixed npc_cleanup_dbsub not removing key and caused pointer being freed problem.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5645 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-17 16:09:47 +00:00
Lance
7f378f29f8 - Fixed typo in script.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5443 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-03-03 08:40:24 +00:00
Lance
2adcba7bb2 * Update to vcprojs. Now lacking strtok_r for VC7.1 (someone please emulate this function using strsep)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5402 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-02-28 15:22:19 +00:00
Lance
465ab78484 * Added script command 'equip' to equip items.
* Fixed dependancies in map-server compiling (VC7.1).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5400 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-02-28 12:32:02 +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