Fixed compatibility issue with SWADE ruleset's combat tracker

ct/ct_entries.xml

@@ -6,4 +6,8 @@
 	<windowclass name="client_ct_entry" merge="join">
 		<script file="ct/scripts/ct_onCardDrop.lua" />
 	</windowclass>
+
+	<windowclass name="combatant" merge="join" ruleset="SWADE">
+		<script file="ct/scripts/ct_onCardDrop.lua" />
+	</windowclass>
 </root>

ct/scripts/ct_onCardDrop.lua

@@ -1,3 +1,10 @@
 function onDrop(x, y, draginfo)
-	return CardsManager.onDropCard(draginfo, getDatabaseNode());
+	local handled = CardsManager.onDropCard(draginfo, getDatabaseNode());
+
+	-- For some reason the onDrop call isn't propogating to other objects in the stack, so we call it manually here if present.
+	if not handled and super and super.onDrop then
+		return super.onDrop(x, y, draginfo);
+	end
+
+	return handled;
 end

scripts/decked_out_messages.lua

@@ -485,6 +485,8 @@ function resolveIdentityName(sIdentity, sMessageIdentity)
 	if sIdentity == "gm" then
 		return "the GM";
 	else
+		-- return User.getIdentityLabel(sIdentity); // This doesn't work unless someone is connected to and controlling the pc otherwise it seems to return nil
+		-- I'm not sure how this works though, since individual players can't access other charsheet nodes, so the display name shouldn't work there either.
 		return ActorManager.getDisplayName(
 			ActorManager.resolveActor(
 				DB.findNode(
@@ -501,7 +503,7 @@ function resolvePronouns(sSender, sReceiver, sMessageId, sDefault)
 			return "their";
 		end
 	else
-		-- If there is a receiver, then we use 'yourself, 'themselves', and 'name
+		-- If there is a receiver, then we use 'yourself, 'themselves', and 'name'
 		if sSender == sReceiver and sSender == sMessageId then
 			return "yourself";
 		end