252 Commits

Author SHA1 Message Date
ultramage
d241d16d2a Some misc cleanups (typos, formatting, forgotten changelog entry etc)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9733 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-28 01:30:15 +00:00
skotlex
d65e051707 - Added a wrapper to delete_timer so it prints out from where the invocation was done.
- Fixed some unsigned warnings.
- Fixed Splash attacks consuming 2 ammo on each attack.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9718 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-26 18:49:46 +00:00
skotlex
da11e41ed4 - Added view_data support to mercenary.*, so that the Homunculus entries are no longer required on the mob_db.
- Removed homunculus entries from mob_db.
- Added the status icon to NPC_CHANGEUNDEAD and the Flee/Hit foods
- Corrected the check that lets you walk when vending/chatting/etc.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9697 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-23 14:08:34 +00:00
ultramage
e034ce07bb Typo hunt
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9684 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-21 12:12:04 +00:00
FlavioJS
78ec0c3b38 yup, i need to rest... (also, copy-paste is eeeevil)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9649 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-12 20:28:11 +00:00
FlavioJS
fa8de3cb7e ups
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9648 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-12 17:15:53 +00:00
FlavioJS
a7ee9a9961 - Cleaned up the ip rules/DDoS section of the code. (the allow,deny and deny,allow cases were switched)
- Updated the information about ip rules and DDoS protection in packet_athena.conf and commented out the line "allow: all" so connections are rejected when a DDoS is detected.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9647 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-12 13:51:38 +00:00
FlavioJS
4b78fc3c9f - Changes to script buildin functions:
* functions checking if a player is attached as soon as possible.
  * functions that required a player attached and would crash if none was 
    there terminate the script now. (others keep the current behaviour to 
    maintain full backward compatibility)
  * removed the unused flag argument in guildskill.
  * bonus,bonus2,bonus3,bonus4 use the same function now (remains the same 
    script-wise)
  * added an optional parameter to setcart,setfalcon,setriding so it's 
    possible to remove the cart/falcon/mount or select a specific cart
  * other cleanups

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9636 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-09 17:31:13 +00:00
ultramage
b0aa97039b Unimportant cleanups
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9633 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-08 16:50:54 +00:00
ultramage
284b66e65c * Silenced the plugin export messages during startup [ultramage]
* Fixed an old debug message displaying %d instead of a number
* Commented out a login_log call (sql doesn't implement that function!)
* Found the reason why the console didn't want to run on windows
* Moved the plugin.def file to the plugins dir and added console.def

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9632 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-08 15:40:41 +00:00
FlavioJS
0129172c63 - Added a precompiler error when the shutdown defines are not found.
- Added parse_console to the plugin API.
- Added plugin for parsing the console. (working with cygwin)
- Added the console plugin to plugin_athena.conf commented out.
- Copied the parse_console code form login txt to login sql and char.
- Added propper plugin version compatibility tests.
- Better output when a plugin fails to load.

-----

The console plugin (at it's 3rd version) uses two pipes and another thread.
- the other thread reads data from stdin and sends it through one of the pipes
- the other pipe serves as semaphore (and terminator) to that thread
- the normal thread checks if the pipe has data once every timer cycle, if data is found it invokes parse_console with that data

Worth noting: the first version didn't use another thread and just checked if data was available on the input stream, but apparently that can't be done to standard input in windows

It's only been tested on cygwin (and should work on most *nix systems), can't test native windows right now because I'm having trouble exporting the required plugin variables in VS8
src/plugins/Makefile hasn't been updated because it's not working properly for me

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9631 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-08 08:35:32 +00:00
FlavioJS
da5d22b67f - Fixed the sleep timers not being removed when the an npc was being unloaded and when reloading scripts.
Ref: http://www.eathena.ws/board/index.php?showtopic=131464

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9629 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-07 17:59:25 +00:00
ultramage
fbe23f27a2 Undid the memset->malloc_set replacement
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9626 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-07 16:49:03 +00:00
FlavioJS
db02576357 - Now winsock 2 is required.
- Cleaned up do_close and socket_init a bit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9621 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-06 12:11:50 +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
ultramage
851a1e259a - Updated /doc from jAthena
- Completed adding of the new cities to @go
  > that function is ugly and needs a complete rewrite, asap
- Updated thor volcano warps

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9615 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-04 18:33:53 +00:00
ultramage
e46b9e7d41 - Now the server will by default perform symmetric adding of friends
- > TODO - symmetric deletion (http://www.eathena.ws/board/index.php?showtopic=130749)
- Added a first approximation of warps for the new maps (by $ephiroth)
- Added Rachel and Veins to the list of @go destinations

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9613 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-03 18:18:50 +00:00
FlavioJS
63c6008744 ups... forgot to remove this before committing
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9612 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-03 12:03:22 +00:00
FlavioJS
129bff5fb6 - Fixed FIFO defines in TURBO mode.
Ref: http://www.eathena.ws/board/index.php?showtopic=129766
  The rest of the TURBO related errors are about the HEAD defines having to be at the start of a block because they contain a variable declaration. (i won't fix these)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9611 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-03 12:01:43 +00:00
ultramage
215762fe8c - Fixed pc_calc_skilltree ignoring prerequisites / joblvl requirements.
- Re-applied change r9593 that got accidentally reverted by r9595.
- Added the official behavior of monsters regaining full hp when they morph.
- Added support for text/comments at the end of monster spawn lines (<tab> required)
- Silenced the debug message in socket.c that's been freaking people out.
- Modified the useless error message in atcommand_effect.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9608 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-01-03 03:05:43 +00:00
FlavioJS
0cf60d9ca1 - Updated getitem and guardian entries in script_commands.txt.
- Fixed getitem trying to get <character ID> from the wrong argument.
- Now getitem can be run on scripts without a player attached if <character ID> is specified.
- Now the two last arguments of guardian are optional and independant of each other ("<event label>" and <guardian index>). This way the previous implementation and script_commands definition are still valid code.
- Now buildin function names and argument definitions are checked for validity before adding the function to the script engine.
  Argument definitions follow the pattern:
    (v|s|i|l)*\?*\*?
    v - value (string or int)
    s - string
    i - int
    l - label
    ? - one optional parameter
    * - unknown number of optional parameters

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9599 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-31 09:22:25 +00:00
skotlex
678096381e - Skill use is now cancelled when you use it while cloaking, and the uncloaking process warps you.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9591 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-29 14:21:09 +00:00
FlavioJS
6a7bdd6ffe - Reapplied Skotlex's socket.c changes from r9587 and r9582. :S (sorry)
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9589 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-28 19:42:59 +00:00
FlavioJS
f863581174 - Part 3 of TheUltraMage's socket cleanup.
- Fixed the packet structure in mmo_char_send006b for PACKETVER 8.
- Removed search_str from add_str (add_str already searches for the string).
- Native script words like do,while,for,... are case insensitive now.
- Changed SCRIPT_HASH_SIZE to 1021 (prime hash sizes give better distributions).
- Added alternative hash implementations to the script engine (to try out later).

removed int_homun.c from header section of the VS8 map project files

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9588 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-28 19:11:40 +00:00
skotlex
807acd0aac - Added a func_parse invocation when an invalid socket is found, so that the underlying code (char/map/login) can handle it and free any related resources.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9587 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-28 18:02:14 +00:00
skotlex
8bcc26d8dd - Some cleaning in do_sendrecv, added error messages when handling an incorrect socket.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9582 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-28 14:03:39 +00:00
skotlex
58bb9be68a - Cleaned up some more the code so it works for -DTURBO
- Cleaned the pvpoff @ and script commands.
- mob_get_random_id now has two additional flags to specify that the monster to acquire should not be a boss type (4) or that it should give exp (8).
- TK_MISSION will now pick any mob from the DB as long as it is not a boss type and it gives base exp.
- Fixed the double-stone issue when hitting a petrified character.
- Minor cleanups


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9573 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-26 15:07:18 +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
52245f90b9 - Moved "#include <limits.h>" to cbasetypes.h to ensure it's included before checking if UINT_MAX has been defined.
- Minor changes in pc_readdb related to max_level being unsigned.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9561 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-23 03:24:32 +00:00
FlavioJS
e75a8eca56 - Change strncpy to memcpy when parsing switches in the script engine since it's guaranteed to be a word of that size (skip_word).
- Made scriptlabel_db duplicate the key. When str_buf is reallocated, the keys in scriptlabel_db could become invalid, causing a crash in npc_convertlabel_db.
( removed the readded >=0x81 equivalent )
- Now npc_convertlabel_db clears scriptlabel_db after using it.
- parse_script has an extra parameter options. At the moment it only indicates if scriptlabel_db should be used or not.
- Fixed "UINT_MAX undeclared" on systems that don't declare it in limits.h

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9557 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-22 05:27:03 +00:00
FlavioJS
a2021e550b - Added a 1-node cache to db. Removed party_cache and guild_cache since now the database has a cache.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9545 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-21 02:32:51 +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
skotlex
e29a1031d5 - Moved PACKETVER to mmo.h, and added support for the expanded character info window on the char-server when PACKETVER is above 7.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9539 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 17:21:56 +00:00
skotlex
edbb476bf9 - Fixed ISSPACE and ISALPHA casting their returned value to a char. These are "bool" functions, and as such return an non-zero int as result, casting them to char just... really messes things up when the returned value is out of the CHAR_MAX/CHAR_MIN range!
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9538 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 16:43:46 +00:00
FlavioJS
40b389bc42 - Changed the script source from unsigned char* to const char*.
- Updated plugins Makefile.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9532 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 07:17:18 +00:00
FlavioJS
4a2db02dec - Fixed the meaning of stdout_with_ansisequence and changed the default value to no.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9531 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-20 02:02:24 +00:00
skotlex
b4ef291d27 - Added missing include of system header limits.h to timer.c
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9523 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-19 17:56:10 +00:00
skotlex
d882e5030b - Reverted the mob ThinkTime update, that field is again aDelay as it apparently should be.
- Fixed one small compilation error.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9522 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-19 13:41:25 +00:00
FlavioJS
43256aa77e - Cleanups or minor changes.
- Now addtick_timer invokes settick_timer, so keep an eye for whatever timer issues it's supposed to have.
- Removed the flush_fifo from clif_parse_TickSend until the socket problems are fixed.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9521 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-19 09:15:00 +00:00
FlavioJS
dd6a713c36 - Cosmetic changes to db.
- Fixed the unused MAPINDEX_AUTOADD section in mapindex.c (mapindex.h wasn't being included)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9515 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-18 15:06:51 +00:00
skotlex
b9fd36a7cd - There will be now warnings printed when a shop sells an item which's buy price is 20z, since those usually are "rare" items with no buyying price set. Note that this reports one fake, and that is the selling of a certain shuriken that indeed costs 20z.
- Most likely fixed client crash when xmas/wedding status runs out.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9505 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-15 18:13:37 +00:00
toms
8bd7d2873e Modified flush_fifo so the code do what is written in the comment
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9489 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-13 16:09:13 +00:00
skotlex
0c362fa90f - Modified flush_fifo so you can decide whether to block the current thread or not until the data is sent. The server-tick reply no longer blocks the current thread.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9486 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-13 13:45:52 +00:00
FlavioJS
129e97d6c9 - Minor changes to ers.
- Removed unused/hardly used cbasetypes typedefs.
- Updated txt-converter's makefile to include utils.o

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9473 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-12 15:24:20 +00:00
FlavioJS
d4185ce10e - Added more helpfull error messages when packet_ver=-1. (no more "clif_parse: Disconnecting session #XX for not having latest client version (has version -1)." messages)
- Joined normal and MINICORE's main function.
- Put malloc_init() first and malloc_final() last as it's needed for Show* in display_title().

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9446 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-10 19:23:04 +00:00
FlavioJS
b524f75cd0 - Reversed revision #9415 (messages with server_tick field being sent as soon as possible) since it didn't fix the client synchronization issue.
- clif_parse_TickSend is sent immediately so the client gets accurate "pings"

Note: in Changelog, for my changes, if they're grouped together and in the same day I'm only gonna "sign" the bottom line.
All unsigned lines are assumed to be from the same person of the previous line (below). (easier searches =P)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9443 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-09 15:57:22 +00:00
FlavioJS
7ecc1ab6e1 - Fixed ladmin's linux compilation and moved some platform specific defines to cbasetypes.h
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9435 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-07 23:59:26 +00:00
FlavioJS
27cc2312fb - Fixing a compilation error caused by me in rev 9414: -.-;
utils.h:35: error: syntax error before "va_list"

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9416 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-06 11:17:08 +00:00
FlavioJS
0931ce5d81 - Messages with server_tick field are sent as soon as possible now.
This might fix client synchronization issues.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9415 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-06 10:57:31 +00:00
FlavioJS
53a7ca362b - Added StringBuf_Vprintf to utils.c and changed the showmsg.c buffer.
Now it uses a static buffer and a StringBuf when needed (a debug message indicating the static buffer needs to be increased is shown).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9414 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-06 04:25:13 +00:00