[Scummvm-cvs-logs] SF.net SVN: scummvm: [25285] scummvm/trunk/engines/scumm/insane/insane.cpp

[cyx at users.sourceforge.net]

Revision: 25285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25285&view=rev
Author:   cyx
Date:     2007-01-30 12:29:01 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
added calls to SmushPlayer::getFont() to prevent accessing non-initialised SmushFont objects

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/insane/insane.cpp

Modified: scummvm/trunk/engines/scumm/insane/insane.cpp
===================================================================
--- scummvm/trunk/engines/scumm/insane/insane.cpp	2007-01-30 20:20:05 UTC (rev 25284)
+++ scummvm/trunk/engines/scumm/insane/insane.cpp	2007-01-30 20:29:01 UTC (rev 25285)
@@ -1251,7 +1251,7 @@
 void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam,
 					   int32 pos_x, int32 pos_y, int32 arg_14, int32 arg_18,
 					   int32 flags, const char *formatString, const char *strng) {
-	SmushFont *sf = _player->_sf[0];
+	SmushFont *sf = _player->getFont(0);
 	int color = 1;
 	int32 top = 0;
 	char *str = NULL, *string;
@@ -1272,7 +1272,7 @@
 			{
 				int id = str[3] - '0';
 				str += 4;
-				sf = _player->_sf[id];
+				sf = _player->getFont(id);
 			}
 			break;
 		case 'c':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.