Commit Graph

59 Commits

Author SHA1 Message Date
eathenabot
45f0261147 * Merged changes up to eAthena 15014.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15063 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-12-11 20:43:49 +00:00
flaviojs
9703374f8a * Fix C++ compilation issues.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14955 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-09-08 19:47:26 +00:00
flaviojs
a39699098f * CMake: Added options BUILD_TXT_SERVERS, BUILD_SQL_SERVERS, BUILD_MAPCACHE.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14921 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-22 14:54:37 +00:00
flaviojs
bdfa11d86e * CMake: Only install template files if they don't already exist.
* CMake: Added plugin targets.
* CMake: Added options BUILD_* to build the converters and individual plugins. (default=OFF)
* CMake: Added option WITH_CPACK for package creation. (default=ON)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14918 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-07-21 06:47:12 +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
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
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
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
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
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
ai4rei
6f5cd0921e * Removed functions 'decode_zip' (ancient) and 'encode_zip' (from r824) from grfio. These were outdated copies of zlib's 'uncompress' and 'compress' respectively (related r1530 and r5152).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14808 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-05-01 07:26:09 +00:00
ai4rei
0a86d090c1 * Updates to map cache generator tool.
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726).
- Updated makefile to use compile options/libraries determined by configure (bugreport:1109).
- Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14646 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-01-01 20:43:02 +00:00
ai4rei
e52ae8ad6c * Removed unmaintained and broken 'adduser' tool (topic:262284).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-28 13:26:35 +00:00
ai4rei
e26ea94a2f * Reverted r14563, due to multiple issues which render the source malfunctioning or uncompilable. To be redone later (bugreport:4627).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14567 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-07 19:45:24 +00:00
Paradox924X
45c05e45b7 Removed unnecessary reference operator from scanf calls passing character strings as arguments in adduser tool.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14566 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-07 19:24:03 +00:00
Paradox924X
ca53ef6f4a Changed almost all instances of sprintf() to snprintf().
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14563 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-12-07 18:38:03 +00:00
FlavioJS
9a8c2a60c9 * Changed the variables of the mapcache structs to fixed size equivalents. (64bit portability issue)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13483 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-01-24 19:38:48 +00:00
ultramage
94943b2b6a Adjusted eAthena code to compile cleanly in C++ mode.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12436 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-26 10:37:45 +00:00
ultramage
8a926e83de Added back the GRF_PATH_FILENAME variable and commandline parameter.
Removed confusing /tool/mapcache/ configuration directory, changed code to use /conf for this purpose.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12154 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-30 16:25:47 +00:00
ultramage
a91d8177c6 Fixed the incorrect interpretation of the map-cell height information stored in .gat files; this was causing an overall of 20000 cells to be treated as water when officially they aren't.
A full mapcache rebuild is needed to apply this change.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11982 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-26 21:51:58 +00:00
FlavioJS
754b397edf * Random cleanup/documentation.
* Made common/Makefile get the svn version from the src directory, not src/common.
* Added a warning message to the install and uninstall targets.
* Renamed all obj directories to obj_all, obj_txt or obj_sql in the makefiles (if an obj/ directory exists, BSD make enters it before reading the makefile)

(run ./configure to update your makefiles, and don't forget to do 'make clean' before updating)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11844 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-30 00:17:26 +00:00
FlavioJS
7bfaec4529 * Normalized makefiles:
- 3 sections: variables, public targets, private/support targets
- object files always in a *_OBJ variable
- header files always in a *_H variable
- object files always generated to an obj* subfolder
- all Makefiles can be executed individually, calling other makefiles if necessary
- generic object targets when possible

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11812 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-26 22:36:30 +00:00
ultramage
26166c5dc6 Commented out msg_athena.conf strings disabled in r11625.
Reverted changes in r11625 that used enum sc_type where it shouldn't have been used.
Removed leftover npc/other/arena.txt.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11627 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-31 16:37:16 +00:00
ultramage
6cca14200e Fixed a nasty bug from r11410 which let people create chars with already taken char names, and (in TXT's case) even cause a crash.
Closes bugreport:234.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11530 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-20 21:21:54 +00:00
ultramage
3d7a129b90 Using predefined constants as parameters to the exit() function.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11501 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-17 17:20:01 +00:00
ultramage
74c5d717aa Fixed memleak hell during mapserver shutdown (if grf reading is used and the deallocation routine is actually called).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11439 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-13 03:00:51 +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
8a45d05f1c Wiped out every mention of RETCODE from /src.
The servers no longer save data using CRCRLF as line terminator on Windows.
Closes bugreport:45.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11187 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-09-13 06:06:30 +00:00
ultramage
dfdb5368c7 Corrected some weird fgets() statements, plus reformatted them
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10616 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-25 15:21:53 +00:00
ultramage
711d01a128 Reformatting @_@
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10581 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-19 15:50:41 +00:00
ultramage
cce7ebedf4 - imported the latest working grfio code from stable
- re-added usage of managed allocation routines in grfio
- eol-styled some new files
- some cosmetic fixes here and there

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10468 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-05 13:57:07 +00:00
ultramage
a6e61e1d2f Gave each file an empty last line, to make svn happier
Added svn:eol-style native where missing
Removed remaining .gats

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10401 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-29 08:17:53 +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
a5407d3948 Partially deobfuscated the grfio module
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10271 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-16 22:56:59 +00:00
ultramage
2216188890 * Finally fixed mingw problems, managed to build both TXT and SQL
* Fixed the uint32 platform problem (Microsoft failed so I removed it :)
* Removed the cbasetypes.h dependency from the mapcache generator
* Removed some random compilation warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10270 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-16 20:44:44 +00:00
DracoRPG
eef15360f9 Small bugfixes and enhancements to the map cache generator
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10267 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-16 00:14:32 +00:00
ultramage
5d3ea3da27 * Played around with MinGW a bit today...
- adjusted code so that it handles mingw-specific compatibility problems
- adjusted the makefile, mingw is not a subset of cygwin
* As an experiment Corrected many /W4 warnings on the txt login server

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10192 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-09 00:46:55 +00:00
ultramage
f6cc6e26d3 - Added missing header to mapcache.c
- Fixed a documentation typo for 'makeitem'

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10184 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-08 12:28:03 +00:00
ultramage
75da66f876 - Fixed the platform-specific stricmp compilation problem
- Fixed inverted vending tax equation (venders getting only 2% zeny instead of 98%), and made it more precise

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10182 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-07 21:15:34 +00:00
ultramage
24db1473f4 - Added function str2ip() to do platform-safe conversions
- Removed a bunch of unused stuff
- Moved SIGILL to unix-only defines since tests and docs show that Windows doesn't issue SIGILL
- Fixed several annoying compilation warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10177 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-07 12:06:25 +00:00
ultramage
87c0efdc89 - Moved e_mail_check() and config_switch() to strlib.h
- Synchronized the login servers a bit

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10174 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-07 04:21:29 +00:00
DracoRPG
7c8f12ccd5 I'm still here!
Rewrote fame ranking lists- changed MAP_NAME_LENGTH to 12, now there's MAP_NAME_LENGTH_EXT at 16 for
	  uses where there is / may be the .gat extension, code adjusted accordingly
- moved map_normalize_name to mapindex_normalize_name so that everything
	  handling map names uses the same extension-removing function
- greatly enhanced the map cache generator, complete documentation on the
	  tool and the map cache format can be found in doc/
- the map cache format changed a bit as a consequence, but of course a new
	  valid one is included (contains latest Nameless Island maps)
- fixed a duplicate entry in map index


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10167 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-06 17:22:40 +00:00
ultramage
91deea9ccd - Removed a missing file reference in the athena-start script
- Fixed a #error "<malloc.h> has been replaced by <stdlib.h>" problem
- Fixed the msg_silent setting not being announced every time

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10077 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-27 07:41:05 +00:00
toms
4bd5a67388 Fixed compilation of the mapcache builder under linux
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10015 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15 15:04:29 +00:00
DracoRPG
4f95fcb339 Updated the src/tool/Makefile to allow compiling the mapcache builder
I don't have an available Unix environment here, so it's very likely it won't work x_x feedback please

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10012 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-15 10:44:19 +00:00
DracoRPG
58dcd187b0 Mapcache update, should polish off remaining bugs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10003 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-13 20:24:08 +00:00
FlavioJS
9e1989e51d - Took care of all the warnings in grfio and mapcache.
- Mapcache can run on system with any endianness.
  The generated file contains data in little endian.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9980 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-09 02:27:16 +00:00
DracoRPG
deb34a8ae5 New mapcache system :x
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9971 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-03-07 02:02:32 +00:00