CGE2: Fix the intro animation.

2 files changed, 29 insertions, 26 deletions

diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 29592d73f1..d0a11643e3 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -402,6 +402,7 @@ void CGE2Engine::movie(const char *ext) {
 		_commandHandler->addCommand(kCmdClear, -1, 0, nullptr);
 		_commandHandlerTurbo->addCommand(kCmdClear, -1, 0, nullptr);
 		_spare->clear();
+		_vga->_showQ->clear();
 		_now = now;
 	}
 }
diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp
index df4c67cbcc..7ba0c3638e 100644
--- a/engines/cge2/snail.cpp
+++ b/engines/cge2/snail.cpp
@@ -848,33 +848,35 @@ void CGE2Engine::feedSnail(Sprite *spr, Action snq, Hero *hero) {
 		CommandHandler::Command *c = &comtab[ptr];
 		CommandHandler::Command *q = &comtab[cnt];
 
-		int pocFre = freePockets(hero->_ref & 1);
-		int pocReq = 0;
-		CommandHandler::Command *p = c;
-		for (; p < q && p->_commandType != kCmdNext; p++) { // scan commands
-			// drop from pocket?
-			if ((p->_commandType == kCmdSend && p->_val != _now)
-				|| p->_commandType == kCmdGive) {
-				int ref = p->_ref;
-				if (ref < 0)
-					ref = spr->_ref;
-				if (findActivePocket(ref) >= 0)
-					--pocReq;
-			}
-			// make/dispose additional room?
-			if (p->_commandType == kCmdRoom) {
-				if (p->_val == 0)
+		if (hero != nullptr) {
+			int pocFre = freePockets(hero->_ref & 1);
+			int pocReq = 0;
+			CommandHandler::Command *p = c;
+			for (; p < q && p->_commandType != kCmdNext; p++) { // scan commands
+				// drop from pocket?
+				if ((p->_commandType == kCmdSend && p->_val != _now)
+					|| p->_commandType == kCmdGive) {
+					int ref = p->_ref;
+					if (ref < 0)
+						ref = spr->_ref;
+					if (findActivePocket(ref) >= 0)
+						--pocReq;
+				}
+				// make/dispose additional room?
+				if (p->_commandType == kCmdRoom) {
+					if (p->_val == 0)
+						++pocReq;
+					else
+						--pocReq;
+				}
+				// put into pocket?
+				if (p->_commandType == kCmdKeep)
 					++pocReq;
-				else
-					--pocReq;
-			}
-			// put into pocket?
-			if (p->_commandType == kCmdKeep)
-				++pocReq;
-			// overloaded?
-			if (pocReq > pocFre) {
-				pocFul();
-				return;
+				// overloaded?
+				if (pocReq > pocFre) {
+					pocFul();
+					return;
+				}
 			}
 		}