TITANIC: Fix some starfield startup crashes and initialization

scummvm · Mar 14, 2017 · 0267faf · 0267faf
1 parent 527b814
commit 0267faf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/engines/titanic/star_control/star_control_sub5.cpp b/engines/titanic/star_control/star_control_sub5.cpp
@@ -175,7 +175,7 @@ bool CStarControlSub5::setup2(int val1, int val2) {
 
 				e->_fieldC = g_vm->getRandomNumber(255);
 				e->_field10 = FACTOR * (double)g_vm->getRandomNumber(15);
-				e->_field14 = ((double)g_vm->getRandomNumber(0xffffffff)
+				e->_field14 = ((double)g_vm->getRandomNumber(0xfffffffe)
 					* 50.0 * 0.000015259022) * 0.00390625;
 			}
 		}

diff --git a/engines/titanic/star_control/surface_area.cpp b/engines/titanic/star_control/surface_area.cpp
@@ -28,11 +28,14 @@ CSurfaceArea::CSurfaceArea(CVideoSurface *surface) {
 	_width = surface->getWidth();
 	_height = surface->getHeight();
 	_pitch = surface->getPitch();
+	_field0 = 0;
+	_colorMask = _color = 0;
+	_mode = SA_NONE;
 
 	// Original supported other pixel depths
 	_bpp = surface->getPixelDepth();
-	assert(_bpp == 2);
 	_pixelsPtr = surface->getPixels();
+	assert(_bpp == 2 && _pixelsPtr);
 
 	initialize();
 }

diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
@@ -166,7 +166,7 @@ class TitanicEngine : public Engine {
 	/**
 	 * Returns a random floating point number between 0.0 to 65535.0
 	 */
-	double getRandomFloat() { return getRandomNumber(0xffffffff) * 0.000015259022; }
+	double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.000015259022; }
 
 	/**
 	 * Support method that generates a savegame name