backporting from master pass 1

Author: Frotty

wurst/_handles/primitives/String.wurst

@@ -136,8 +136,9 @@ public function string.trim(string val) returns string
 	If the string does not exist, the returnvalue is -1
 */
 public function string.indexOf(string s) returns int
-	for int i = 0 to this.length() - s.length()
-		if this.substring(i, i + s.length()) == s
+	let len = s.length()
+	for int i = 0 to this.length() - len
+		if this.substring(i, i + len) == s
 			return i
 	return -1
 

wurst/closures/ClosureEvents.wurst

@@ -77,7 +77,8 @@ public abstract class OnCastListener
 			else if prev != null
 				prev.next = next
 
-		next.prev = prev
+		if next != null
+			next.prev = prev
 
 		next = null
 		prev = null
@@ -92,14 +93,16 @@ public abstract class OnCast extends OnCastListener
 public abstract class OnPointCast extends OnCastListener
 
 	override function fire(unit caster)
-		fireEx(caster, EventData.getSpellTargetPos())
+		if EventData.getSpellTargetUnit() == null
+			fireEx(caster, EventData.getSpellTargetPos())
 
 	abstract function fireEx(unit caster, vec2 target)
 
 public abstract class OnUnitCast extends OnCastListener
 
 	override function fire(unit caster)
-		fireEx(caster, GetSpellTargetUnit())
+		if EventData.getSpellTargetUnit() != null
+			fireEx(caster, EventData.getSpellTargetUnit())
 
 	abstract function fireEx(unit caster, unit target)
 
@@ -129,6 +132,8 @@ public abstract class EventListener
 	static function add(unit u, eventid eventId, EventListener listener) returns EventListener
 		let uid = u.getIndex()
 		if uid <= 0
+			Log.warn("Attempting to register event listener for a unit that is not indexed by UnitIndexer. " +
+				"If this happens during initialization, consider registering the EventListener in a callback to nullTimer() instead.")
 			return listener
 		listener.eventId = eventId.toIntId()
 		listener.uid = uid
@@ -169,9 +174,10 @@ public abstract class EventListener
 				listener.next = castMapCasters[index]
 			castMapCasters[index] = listener
 		else
-			if castMap.has(abilId)
-				castMap.get(abilId).prev = listener
-				listener.next = castMap.get(abilId)
+			let entry = castMap.get(abilId)
+			if entry != null
+				entry.prev = listener
+				listener.next = entry
 
 			castMap.put(abilId, listener)
 		return listener
@@ -180,9 +186,10 @@ public abstract class EventListener
 		let trigUnit = GetTriggerUnit()
 		let id = GetTriggerEventId().toIntId()
 		// Unit Listeners
-		if trigUnit != null and fireEvents(trigUnit) and trigUnit.getIndex() > 0
-			if unitListenersFirsts[trigUnit.getIndex()] != null
-				var listener = unitListenersFirsts[trigUnit.getIndex()]
+		if trigUnit != null
+			let index = trigUnit.getIndex()
+			if fireEvents(trigUnit) and index > 0 and unitListenersFirsts[index] != null
+				var listener = unitListenersFirsts[index]
 				while listener != null
 					let nextListener = listener.next
 					if listener.eventId == id

wurst/closures/ClosureTimers.wurst

@@ -120,6 +120,9 @@ public abstract class CallbackSingle
 		cb.call()
 		destroy cb
 
+	function getRemaining() returns real
+		return t.getRemaining()
+
 	ondestroy
 		t.release()
 

wurst/data/LinkedList.wurst

@@ -312,6 +312,18 @@ public class LinkedList<T>
 		destroy predicate
 		return result
 
+	/** Returns the first element that satisfies the predicate, or null if none present */
+	function find(LinkedListPredicate<T> predicate) returns T
+		T result = null
+		let iter = this.iterator()
+		for elem from iter
+			if predicate.isTrueFor(elem)
+				result = elem
+				break
+		iter.close()
+		destroy predicate
+		return result
+
 	/** internal merge sort */
 	private function sort(Comparator<T> comparator, LLEntry<T> e) returns LLEntry<T>
 		if e == dummy or e.next == dummy
@@ -479,6 +491,13 @@ public class LLIterator<T>
 			retVal = current.next.elem
 		return retVal
 
+	/** Adds an element before the currently iterated element */
+	function addBefore(T elem)
+		let entry = new LLEntry<T>(elem, current.prev, current)
+		current.prev.next = entry
+		current.prev = entry
+		parent.size++
+
 	function close()
 		if destroyOnClose
 			destroy this

wurst/event/RegisterEvents.wurst

@@ -25,7 +25,7 @@ public function registerPlayerUnitEvent(playerunitevent p, code filter, code con
 		t[hid].addAction(action)
 
 public function registerPlayerUnitEventForPlayer(playerunitevent p, code c, player pl)
-	let i = 16 * p.getHandleId() + pl.getId()
+	let i = bj_MAX_PLAYER_SLOTS * p.getHandleId() + pl.getId()
 	if t[i] == null
 		t[i] = CreateTrigger()
 		t[i].registerPlayerUnitEvent(pl, p, null)

wurst/math/Bitwise.wurst

@@ -60,7 +60,7 @@ public function byte4.toInt() returns int
 public function int.toUnsigned() returns int
 	int result
 	if this < 0
-		result = -2147483648 + this
+		result = INT_MAX + this + 1
 	else
 		result = this
 	return result
@@ -82,7 +82,7 @@ public function int.bytes() returns byte4
 	var value = this
 	var isNegative = 0
 	if value < 0
-		value = -2147483648 + value
+		value = INT_MAX + value + 1
 		isNegative = 1
 
 	let b1 = value mod 0x100
@@ -159,7 +159,7 @@ function bwShiftr32(int num, int shift) returns int
 	var value = num
 	var isNegative = 0
 	if value < 0
-		value = -2147483648 + value
+		value = INT_MAX + value + 1
 		isNegative = 1
 	return isNegative * powShift[31-shift] + value div powShift[shift]
 

wurst/math/BitwiseTests.wurst

@@ -26,7 +26,7 @@ function bitStringTests()
 	"0001".fromBitString().assertEquals(1)
 	"1000".fromBitString().assertEquals(8)
 	"1001".fromBitString().assertEquals(9)
-	"10000000 00000000 00000000 00000000".fromBitString().assertEquals(-2147483648)
+	"10000000 00000000 00000000 00000000".fromBitString().assertEquals(INT_MIN)
 	"11111111 11111111 11111111 11111111".fromBitString().assertEquals(-1)
 
 @test