gemrb/GUIScripts/bg2/Start2.py

@@ -36,7 +36,7 @@ def OnLoad():
 	global ExitButton, OptionsButton, MultiPlayerButton, MoviesButton, SinglePlayerButton, BackButton
 	global SinglePlayerButton, skip_videos
 
-	if skip_videos == None:
+	if skip_videos is None:
 		skip_videos = GemRB.GetVar ("SkipIntroVideos")
 
 	GemRB.LoadWindowPack("START", 640, 480)
@@ -75,11 +75,11 @@ def OnLoad():
 	if GemRB.GetVar("oldgame")==1:
 		if GameCheck.HasTOB():
 			StartWindow.SetPicture("STARTOLD")
-		if not skip_videos&4:
+		if not skip_videos and not skip_videos&4:
 			GemRB.PlayMovie ("INTRO15F", 1)
 			skip_videos |= 4
 	else:
-		if not skip_videos&2:
+		if not skip_videos and not skip_videos&2:
 			GemRB.PlayMovie ("INTRO", 1)
 			skip_videos |= 2
 

gemrb/core/GameScript/GameScript.cpp

@@ -2434,7 +2434,7 @@ void GameScript::ExecuteAction(Scriptable* Sender, Action* aC)
 				scr->CurrentActionInterruptable = false;
 			}
 		} else {
-			Log(ERROR, "GameScript", "Actionoverride failed for object: ");
+			Log(ERROR, "GameScript", "ActionOverride failed for object: ");
 			aC->objects[0]->dump();
 		}
 
@@ -2455,7 +2455,7 @@ void GameScript::ExecuteAction(Scriptable* Sender, Action* aC)
 			Sender->Activate();
 			if (actionflags[actionID]&AF_ALIVE) {
 				if (Sender->GetInternalFlag()&IF_STOPATTACK) {
-					Log(WARNING, "GameScript", "Aborted action due to death");
+					Log(WARNING, "GameScript", "Aborted action due to death!");
 					Sender->ReleaseCurrentAction();
 					return;
 				}

gemrb/core/Scriptable/Actor.cpp

@@ -7551,7 +7551,7 @@ void Actor::PerformAttack(ieDword gameTime)
 
 	ModifyWeaponDamage(wi, target, damage, critical);
 
-	if (target->GetStat(IE_MC_FLAGS) & MC_INVULNERABLE) {
+	if (third && target->GetStat(IE_MC_FLAGS) & MC_INVULNERABLE) {
 		Log(DEBUG, "Actor", "Attacking invulnerable target, nulifying damage!");
 		damage = 0;
 	}

gemrb/plugins/FXOpcodes/FXOpcodes.cpp

@@ -1388,7 +1388,7 @@ int fx_damage (Scriptable* /*Owner*/, Actor* target, Effect* fx)
 		}
 	}
 
-	if (target->GetStat(IE_MC_FLAGS) & MC_INVULNERABLE) {
+	if (core->HasFeature(GF_3ED_RULES) && target->GetStat(IE_MC_FLAGS) & MC_INVULNERABLE) {
 		Log(DEBUG, "fx_damage", "Attacking invulnerable target, skipping!");
 		return FX_NOT_APPLIED;
 	}