- Increased the range for unlocking out of Close confine.

- Reverted some changes in cbasetypes.h which actually broke compilation.


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

2 files changed, 5 insertions, 7 deletions

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index b84a0c88e..505eb6752 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -91,14 +91,9 @@ typedef int*			pint;
 //////////////////////////////

 #ifdef WIN32

 //////////////////////////////

-//These three are already redefined on my_global.h on Windows systems.

-#ifdef TXT_ONLY

 typedef          __int8		int8;

-typedef          __int32	int32;

-typedef unsigned __int32	uint32;

-#endif

-

 typedef          __int16	int16;

+typedef          __int32	int32;

 

 typedef signed __int8		sint8;

 typedef signed __int16		sint16;

@@ -106,6 +101,7 @@ typedef signed __int32		sint32;
 

 typedef unsigned __int8		uint8;

 typedef unsigned __int16	uint16;

+typedef unsigned __int32	uint32;

 //////////////////////////////

 #else // GNU

 //////////////////////////////

diff --git a/src/map/status.c b/src/map/status.c
index e85bb0ebf..d360abdab 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4948,7 +4948,9 @@ int status_change_end( struct block_list* bl , int type,int tid )
 				break;

 			case SC_CLOSECONFINE:

 				if (sc->data[type].val2 > 0) { //Caster has been unlocked... nearby chars need to be unlocked.

-					int range = 2*skill_get_range2(bl, StatusSkillChangeTable[type], sc->data[type].val1);

+					int range = 1

+					  	+skill_get_range2(bl, StatusSkillChangeTable[type], sc->data[type].val1)

+						+skill_get_range2(bl, TF_BACKSLIDING, 1); //Since most people use this to escape the hold....

 					map_foreachinarea(status_change_timer_sub, 

 						bl->m, bl->x-range, bl->y-range, bl->x+range,bl->y+range,BL_CHAR,bl,sc,type,gettick());

 				}