ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed "addr" redefinition, so WIN32 version compiles again. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@49 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
gunfight 2002-03-18 14:40:07 +00:00
parent 3b496cf0dc
commit 47f740acdd
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stella/src/emucore/CartCV.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: CartCV.cxx,v 1.1 2002-01-18 15:58:46 estolberg Exp $
// $Id: CartCV.cxx,v 1.2 2002-03-18 14:40:07 gunfight Exp $
//============================================================================
#include <assert.h>
@ -24,6 +24,8 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeCV::CartridgeCV(const uInt8* image, uInt32 size)
{
uInt32 addr;
if(size == 2048)
{
// Copy the ROM image into my buffer
@ -45,13 +47,13 @@ CartridgeCV::CartridgeCV(const uInt8* image, uInt32 size)
// Usefull for MagiCard program listings
// Copy the ROM image into my buffer
for(uInt32 addr = 0; addr < 2048; ++addr)
for(addr = 0; addr < 2048; ++addr)
{
myImage[addr] = image[addr + 2048];
}
// Copy the RAM image into my buffer
for(uInt32 addr = 0; addr < 1024; ++addr)
for(addr = 0; addr < 1024; ++addr)
{
myRAM[addr] = image[addr];
}

8
stella/src/emucore/CartDPC.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: CartDPC.cxx,v 1.1 2001-12-30 18:43:30 bwmott Exp $
// $Id: CartDPC.cxx,v 1.2 2002-03-18 14:40:07 gunfight Exp $
//============================================================================
#include <assert.h>
@ -23,14 +23,16 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeDPC::CartridgeDPC(const uInt8* image, uInt32 size)
{
uInt32 addr;
// Copy the program ROM image into my buffer
for(uInt32 addr = 0; addr < 8192; ++addr)
for(addr = 0; addr < 8192; ++addr)
{
myProgramImage[addr] = image[addr];
}
// Copy the display ROM image into my buffer
for(uInt32 addr = 0; addr < 2048; ++addr)
for(addr = 0; addr < 2048; ++addr)
{
myDisplayImage[addr] = image[8192 + addr];
}