Browse Source

Fixed some messed up operator priority in the mapreg code (bugreport:2078).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13088 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 năm trước cách đây
mục cha
commit
26a6b9c61c
2 tập tin đã thay đổi với 12 bổ sung12 xóa
  1. 8 8
      src/map/mapreg_sql.c
  2. 4 4
      src/map/mapreg_txt.c

+ 8 - 8
src/map/mapreg_sql.c

@@ -36,8 +36,8 @@ char* mapreg_readregstr(int uid)
 /// Modifies the value of an integer variable.
 bool mapreg_setreg(int uid, int val)
 {
-	int num = uid & 0x00ffffff;
-	int i   = uid & 0xff000000 >> 24;
+	int num = (uid & 0x00ffffff);
+	int i   = (uid & 0xff000000) >> 24;
 	const char* name = get_str(num);
 
 	if( val != 0 )
@@ -75,8 +75,8 @@ bool mapreg_setreg(int uid, int val)
 /// Modifies the value of a string variable.
 bool mapreg_setregstr(int uid, const char* str)
 {
-	int num = uid & 0x00ffffff;
-	int i   = uid & 0xff000000 >> 24;
+	int num = (uid & 0x00ffffff);
+	int i   = (uid & 0xff000000) >> 24;
 	const char* name = get_str(num);
 	
 	if( str == NULL || *str == 0 )
@@ -159,8 +159,8 @@ static void script_save_mapreg(void)
 	iter = mapreg_db->iterator(mapreg_db);
 	for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) )
 	{
-		int num = key.i & 0x00ffffff;
-		int i   = key.i & 0xff000000 >> 24;
+		int num = (key.i & 0x00ffffff);
+		int i   = (key.i & 0xff000000) >> 24;
 		const char* name = get_str(num);
 
 		if( name[1] == '@' )
@@ -174,8 +174,8 @@ static void script_save_mapreg(void)
 	iter = mapregstr_db->iterator(mapregstr_db);
 	for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) )
 	{
-		int num = key.i & 0x00ffffff;
-		int i   = key.i & 0xff000000 >> 24;
+		int num = (key.i & 0x00ffffff);
+		int i   = (key.i & 0xff000000) >> 24;
 		const char* name = get_str(num);
 		char tmp_str2[2*255+1];
 

+ 4 - 4
src/map/mapreg_txt.c

@@ -115,8 +115,8 @@ static void script_save_mapreg(void)
 	iter = mapreg_db->iterator(mapreg_db);
 	for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) )
 	{
-		int num = key.i & 0x00ffffff;
-		int i   = key.i & 0xff000000 >> 24;
+		int num = (key.i & 0x00ffffff);
+		int i   = (key.i & 0xff000000) >> 24;
 		const char* name = get_str(num);
 
 		if( name[1] == '@' )
@@ -132,8 +132,8 @@ static void script_save_mapreg(void)
 	iter = mapregstr_db->iterator(mapregstr_db);
 	for( data = iter->first(iter,&key); iter->exists(iter); data = iter->next(iter,&key) )
 	{
-		int num = key.i & 0x00ffffff;
-		int i   = key.i & 0xff000000 >> 24;
+		int num = (key.i & 0x00ffffff);
+		int i   = (key.i & 0xff000000) >> 24;
 		const char* name = get_str(num);
 
 		if( name[1] == '@' )