Commit Graph

47 Commits

Author SHA1 Message Date
ai4rei
bba102a818 * Added separate character state for vending (like for buyingstore), instead of vender_id != 0 (follow up to r14682, related r14713).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14762 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-03-27 18:43:31 +00:00
ai4rei
ce3f78556c * Implemented buying store system (aka. reverse vending, purchase shop) together with related skill and items, without NPCs.
- For SQL apply upgrade_svn14713_log.sql to upgrade tables `picklog` and `zenylog`; for TXT no action is necessary.
- Requires 2010-04-20aRagexeRE or later and can be disabled in 'conf/battle/feature.conf'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14713 54d463be-8e91-2dee-dedb-b68131a5f0ec
2011-02-19 12:59:36 +00:00
ai4rei
3c92cf8047 * mail_deliveryfail no longer attempts to log (since r12910) and give items (since r11855), when there is no item attached to the mail (bugreport:3239).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14482 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-11-22 09:09:01 +00:00
Paradox924X
2f9e3dbf81 Replaced all nullpo_retr() calls which returned 0 with nullpo_ret() calls.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14414 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-10-09 01:57:04 +00:00
Skotlex
e19451d423 - Implemented usage of packets 0x7fa and 0x7f7, 0x7f8, 0x7f9. These are used for proper deletion of items as well as movement/spawn packets for Renewal clients.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14383 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-08-19 15:46:55 +00:00
brianluau
4213c1bc95 - Changed mail_setattachment() to fail if you are OVER 100% overweight.
This prevents item loss if the send mail fails. (bugreport:4144)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14271 54d463be-8e91-2dee-dedb-b68131a5f0ec
2010-03-24 23:58:51 +00:00
Inkfish
d9c5d83bda Fixed rental items can be moved into guild storage from cart.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14083 54d463be-8e91-2dee-dedb-b68131a5f0ec
2009-10-06 02:24:10 +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
Lupus
ae9e0179f6 added missing 'e' logs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12910 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-07-04 03:54:35 +00:00
zephyrus
9bfb1ac1be - More scripts fixes.
- Some cleanups to the code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12695 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-05-09 03:12:26 +00:00
zephyrus
a6e03e1102 - Clean up of calc_times function.
- Moved to timer.c/h because it's used in both map and char servers.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12382 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-17 15:03:03 +00:00
zephyrus
0b52a40be3 - Fixed a bug allow GM with notrade to send zeny.
- Added a fix into auction system allow to direct buy or increase your own bid if you reach the 5 bids limit.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12335 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-10 02:44:07 +00:00
zephyrus
bb503db395 - Fixed a possible crash bug on mail system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12320 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-07 20:40:59 +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
84ffdd36bf - The last, i hope, fix to the mail system.
* kRO have a possible way to read mail by just sending the open mail window packet to the client.
This protection adds a mapflag town, to set the only maps that allow mail operations.
because there is no way to know when client closes the mail inbox window. *

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12279 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-03-02 23:03:22 +00:00
skotlex
1e0a82fab3 - Fixed new guilds displaying online-connect member count at 0 rather than 1, and the guild master not knowing it is one (eg: it cannot edit the guild notice of a newly created guild until relogging).
- Fixed acc_reg2 parsing screwing up the char_id and subtracting 2 from it rather than passing it as it is.
- Extended the auth_node/auth_db system in chrif.c to handle log in/out and mapserver-change procedures. This way players are not in the main dbs when they are not "active", which blocks potential invalid accesses to them.
- Replaced states auth, waiting_disconnect and finalsave with active.  
- Cleaned some the party/guild login and creation procedures, removed the party_sent/guild_sent states.
- Removed a redundant guild_check_member call which is beyond not-needed and into the realm of wasting resources.
- clif_parse will no longer process packets from !sd->state.active players, this also makes checking for finalsave uneccessary (since players re already removed from the maps and dbs by this point, so you can't access them in any other way)
- Separated the roles of unit_free and map_quit, the former will handle cleaning structures from the player so it can be free'd safely, while the latter performs additional routines which are unique to characters logging out normally (map-server changes will invoke unit_free and bypass map_quit).
- Removed pc_isplaying, quit_db, map_knowsaccount, MAPIT_PCISPLAYING among other functions/defines which are no longer needed due to the new login scheme.
- Cleand up a bit some code in the clif_send(_sub) functions.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12223 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-21 00:13:56 +00:00
zephyrus
8b151df5c7 - Some fixes to mail system.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12199 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-02-13 17:55:32 +00:00
zephyrus
825d214242 - Fixed a visual itemdupple bug on mail system.
- Fixed Overthrusth status cannot being recalled at same skill lvl.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12023 54d463be-8e91-2dee-dedb-b68131a5f0ec
2008-01-06 16:43:02 +00:00
zephyrus
2b1fac216c - Added a fix to prevent missing a mail attachment is map servers disconnect from char server.
- Fixed the sprite of Wing of Victory.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11855 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-12-03 22:25:57 +00:00
zephyrus
0cf565292d - Important fix to Mail System allowing (by a low change) items duple.
- Added picklog to mail.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11721 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-12 08:55:36 +00:00
zephyrus
009ce06822 - Some updates on the mail system packets [Zephyrus]
- Corrected the mail database structure on main.sql
- TODO: find what happens when you cannot receive an emailed item due to weight problems.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11692 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-11-07 17:16:53 +00:00
zephyrus
f0cc5dd038 - Fixed a bug on the Attachment [Mail System]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11593 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-28 15:12:54 +00:00
ultramage
b6bbaef27b Followup fixes to r11583:
* fixed wrong sql upgrade file name, added svn:eol-style native
 * made 'status' variable directly use the mail_status enum
 * replaced some hardcoded numbers in mail queries with references to the enum
 * fixed a query which still used 'read_flag'
 * fixed all new mails being displayed as 'already read'
 * removed sd nullpo checks from parse_ functions as that can never happen
 * fixed mapserver sending (and charserver saving) junk item fields when there is no item attached to a mail
 * fixed wrong mail send packet interpretation saving random memory after message body ('body_len' doesn't include the terminating zero)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11584 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 09:48:27 +00:00
zephyrus
284222a415 - Improvements to the mail system.
- Added a sql patch, renaming "read_flag" column to "status" on the mail db.
- Need more testing.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11583 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-10-27 06:34:04 +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
0072a0189e * Cleaned/clarified some #include relationships between headers
* Changed clif_sitting() to use 'bl' instead of 'sd' (for non-player objects)
* Removed way messed-up script function 'unitdeadsit'
* Tagged 'FIXME' lines written by myself

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11040 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-08-19 12:55:29 +00:00
ultramage
9e7eb8804f - Removed the TURBO socket mechanism - it was in fact just using a variable to cache a few arithmetic operations (premature optimization)
- Since the fifohead mess is gone, fixed leftover bad code structuring

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10599 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-05-21 18:40:29 +00:00
ultramage
6867d93866 typos: recieve -> receive
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10163 54d463be-8e91-2dee-dedb-b68131a5f0ec
2007-04-05 19:02:52 +00:00
FlavioJS
637ae9a4dc - Massive EOL normalization & 'svn:eol-style native' flag setting for all txt/conf/h/c files.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9410 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-12-05 13:23:07 +00:00
skotlex
0c91b56537 - Crash-protections in the mail-checking function.
- Changed a bunch of msg_table use into msg_txt in atcommand.c, there's still a lot left... am not feeling inspired to finish this >.<
- Some additional parenthesis on equipment check in pc_equipitem, seems to have fixed the mid/lower headgear-sprites not showing up.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8195 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-08-09 00:49:38 +00:00
skotlex
14866f881c - Fixed map-sql compilation issue ~.~;
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7619 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-11 20:34:05 +00:00
skotlex
cd8587dc4d - Fixed clif_parse not checking for func_parse before sending data to the connected clients. This in turn required various code-rewrites in:
- duel related messaging functions (added clif targets DUEL/DUEL_WOS).
- intif whisper to gm function
- day/night timers
- Rewrote the parse_console function to stop allocating/deallocating memory on every call.
- Modified chrif_charselectreq to receive the player's ip among the data.
- Added function clif_disp_message, which is the same as clif_disp_onlyself, except you can specify the targets (it sends a guild-chat packet)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7617 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-07-11 20:16:55 +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
Valaris
fd99753f8e Clearing trunk.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5091 54d463be-8e91-2dee-dedb-b68131a5f0ec
2006-01-29 16:00:45 +00:00
amber
5f5b45e2a4 eAthena VC7 solution and support added for native builds [MouseJstr]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1347 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-03-30 22:14:36 +00:00
celest
72f63ee03e * updated map server to jA1137~1159
* Some tidying up in mob.c and skill.c

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1342 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-03-30 11:44:12 +00:00
amber
13eeee2ee6 More C/C++ Conformance fixes
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1334 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-03-29 16:46:19 +00:00
celest
4690d238e7 Typo ^^;
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1322 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-03-29 04:09:37 +00:00
celest
5927adb9bd * Some tidying up in mail.c
* Added an invalid pointer check in clif_displaymessage

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1320 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-03-29 03:37:06 +00:00
(no author)
778e804dd6 update
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@968 54d463be-8e91-2dee-dedb-b68131a5f0ec
2005-01-23 20:38:44 +00:00
codemaster
f16fea0829 * Updated makefiles to new strlib locations [Codemaster]
* Moved strlib.h and strlib.c into the common directory [Codemaster]
* Updated a bit of jA 1081 - it's not completly updated yet!!! [Codemaster]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@681 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-20 20:11:23 +00:00
Lupus
6dc1ff8f25 added jstrescape()
to all TXT agrs as MESSAGE / NAME
by Valaris

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@664 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-20 17:59:24 +00:00
Lupus
07eee64dc7 MAIL: moved all string messages from HARDCODED strings to
msg_athena.conf

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@548 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-12 21:19:14 +00:00
Lupus
fab8d70468 speedup of SQL logs
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@437 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-12-02 18:24:27 +00:00
amber
d479e29aee Fixed some file types
git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@172 54d463be-8e91-2dee-dedb-b68131a5f0ec
2004-11-14 16:18:26 +00:00
(no author)
706e785091 git-svn-id: https://svn.code.sf.net/p/rathena/svn/athena@2 54d463be-8e91-2dee-dedb-b68131a5f0ec 2004-11-04 23:25:09 +00:00