Diff of /gemrb/core/Scriptable/Scriptable.cpp [d3c55c] .. [8e2649]  Maximize  Restore

  Switch to side-by-side view

--- a/gemrb/core/Scriptable/Scriptable.cpp
+++ b/gemrb/core/Scriptable/Scriptable.cpp
@@ -858,14 +858,14 @@
 			}
 		}
 		char* spell = core->GetString(spl->SpellName);
-		if (stricmp(spell, "")) {
+		if (stricmp(spell, "") && Type == ST_ACTOR) {
 			char* msg = core->GetString(displaymsg->GetStringReference(STR_ACTION_CAST), 0);
 			char *tmp;
 			if (target) {
 				tmp = (char *) malloc(strlen(msg)+strlen(spell)+strlen(target->GetName(-1))+5);
 				sprintf(tmp, "%s %s : %s", msg, spell, target->GetName(-1));
 			} else {
-				tmp = (char *) malloc(strlen(msg)+strlen(spell)+4);
+				tmp = (char *) malloc(strlen(spell)+strlen(GetName(-1))+4);
 				sprintf(tmp, "%s : %s", spell, GetName(-1));
 			}
 			displaymsg->DisplayStringName(tmp, DMC_WHITE, this);
@@ -1159,6 +1159,7 @@
 			// we have to remove it manually
 			actor->fxqueue.RemoveAllEffectsWithParam(fx_force_surge_modifier_ref, 1);
 		}
+		actor->ResetCommentTime();
 	}
 
 	gamedata->FreeSpell(spl, SpellResRef, false);