← Back to branch summary

~ubuntu-branches/ubuntu/raring/scummvm/raring

« back to all changes in this revision

Viewing changes to engines/cruise/dataLoader.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Moritz Muehlenhoff
  • Date: 2011-05-25 19:02:23 UTC
  • mto: (21.1.2 sid)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20110525190223-fiqm0oaec714xk31
Tags: upstream-1.3.0
Import upstream version 1.3.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
engines/cruise/dataLoader.cpp
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
20
20
 *
21
 
 * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/tags/release-1-2-1/engines/cruise/dataLoader.cpp $
22
 
 * $Id: dataLoader.cpp 48218 2010-03-10 06:39:23Z eriktorbjorn $
 
21
 * $URL$
 
22
 * $Id$
23
23
 *
24
24
 */
25
25
 
26
26
#include "cruise/cruise_main.h"
27
27
#include "common/endian.h"
 
28
#include "common/memstream.h"
 
29
#include "common/textconsole.h"
28
30
 
29
31
namespace Cruise {
30
32
 
55
57
                break;
56
58
 
57
59
        default:
58
 
                error("Unkown gfx format %d", format);
 
60
                error("Unknown gfx format %d", format);
59
61
        }
60
62
 
61
63
        uint8 *buffer = (uint8 *)MemAlloc(spriteSize);
357
359
        uint8 *ptr2 = ptr;
358
360
        uint8 *destPtr;
359
361
        int fileIndex;
360
 
        uint32 fontSize;
 
362
        //uint32 fontSize;
361
363
 
362
364
        ptr2 += 4;
363
365
        loadFileVar1 = READ_BE_UINT32(ptr2);
372
374
 
373
375
        memcpy(destPtr, ptr2, loadFileVar1);
374
376
 
375
 
        fontSize = READ_BE_UINT32(ptr2);
 
377
        //fontSize = READ_BE_UINT32(ptr2);
376
378
 
377
379
        if (destPtr != NULL) {
378
380
                int32 i;