Browse Source

- Added source reporting when you do an invalid int&str or str&int operation on a script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@7782 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 years ago
parent
commit
7e68dd7948
2 changed files with 3 additions and 0 deletions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 0
      src/map/script.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 
 2006/07/20
 2006/07/20
+	* Added source reporting when you do an invalid int&str or str&int
+	  operation on a script. [Skotlex]
 	* Fixed the intif party creation packet having the incorrect size sent,
 	* Fixed the intif party creation packet having the incorrect size sent,
 	  hence causing the leader's level to be read as garbage (which caused the
 	  hence causing the leader's level to be read as garbage (which caused the
 	  "impossible to even share" bug). [Skotlex]
 	  "impossible to even share" bug). [Skotlex]

+ 1 - 0
src/map/script.c

@@ -11327,6 +11327,7 @@ void op_2(struct script_state *st,int op)
 	}else{
 	}else{
 		// si,is => error
 		// si,is => error
 		ShowWarning("script: op_2: int&str, str&int not allow.");
 		ShowWarning("script: op_2: int&str, str&int not allow.");
+		report_src(st);
 		push_val(st->stack,C_INT,0);
 		push_val(st->stack,C_INT,0);
 	}
 	}
 }
 }