- Added SC_KEEPING/SC_BARRIER to calc_flag in status_change_end

- Added Option constants for Carts, fixed OPTION_FLYING (it conflicts with OPTION_XMAS?)
- Updated clif.c to check for OPTION_WEDDING|OPTION_XMAS instead of view class to block attacks and skill usage.
- Removed struct pc_base_job and functions pc_calc_base_job/pc_calc_base_job2 which are no longer used anywhere (were long ago deprecated infavor of the new jobid system)
- Cleaned up change-cart code.
- Modified SC_XMAS to not change your view anymore and only set the proper option value (OPTION_XMAS)
- Cleaned up the code regarding char_gm reading.
- Changed the option field to unsigned short to make room for the higher values.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6229 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/char/char.c b/src/char/char.c
index b0a261f56..28ae5dea1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3322,8 +3322,8 @@ int parse_char(int fd) {
 			WFIFOL(fd,2) = cd->char_id;

 			memcpy(WFIFOP(fd,6), mapindex_id2name(cd->last_point.map), MAP_NAME_LENGTH);

 			ShowInfo("Character selection '%s' (account: %d, slot: %d).\n", cd->name, sd->account_id, ch);

-						    

-			// Andvanced subnet check [LuzZza]

+			

+			// Advanced subnet check [LuzZza]

 			if((subnet_map_ip = lan_subnetcheck((long *)p)))

 				WFIFOL(fd,22) = subnet_map_ip;

 			else