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

Merge pull request #44 from owomomo/master 

Fix Ram search bug
This commit is contained in:
CaH4e3 2019-04-01 09:26:05 +03:00 committed by GitHub
parent 45dcb3e242 19d8e8ffbb
commit 59abf58a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/drivers/win/ram_search.cpp
View File

@ -412,22 +412,21 @@ void ItemIndexToVirtualRegion(unsigned int itemIndex, MemoryRegion& virtualRegio
return; return;
} }
MemoryRegion* regionPtr = s_itemIndexToRegionPointer[itemIndex]; MemoryRegion* region = s_itemIndexToRegionPointer[itemIndex];
MemoryRegion& region = *regionPtr;
int bytesWithinRegion = (itemIndex - region.itemIndex) * sizeof(stepType); int bytesWithinRegion = (itemIndex - region->itemIndex) * sizeof(stepType);
int startSkipSize = ((unsigned int)(sizeof(stepType) - region.hardwareAddress)) % sizeof(stepType); int startSkipSize = ((unsigned int)(sizeof(stepType) - region->hardwareAddress)) % sizeof(stepType);
bytesWithinRegion += startSkipSize; bytesWithinRegion += startSkipSize;
virtualRegion.size = sizeof(compareType); virtualRegion.size = sizeof(compareType);
virtualRegion.hardwareAddress = region.hardwareAddress + bytesWithinRegion; virtualRegion.hardwareAddress = region->hardwareAddress + bytesWithinRegion;
virtualRegion.virtualIndex = region.virtualIndex + bytesWithinRegion; virtualRegion.virtualIndex = region->virtualIndex + bytesWithinRegion;
virtualRegion.itemIndex = itemIndex; virtualRegion.itemIndex = itemIndex;
region.cheatAffect = 0; virtualRegion.cheatAffect = 0;
for (int i = 0; i < numsubcheats; i++) for (int i = 0; i < numsubcheats; ++i)
if (SubCheats[i].addr >= region.hardwareAddress && SubCheats[i].addr < region.hardwareAddress + region.size) if (SubCheats[i].addr >= virtualRegion.hardwareAddress && SubCheats[i].addr < virtualRegion.hardwareAddress + virtualRegion.size)
++region.cheatAffect; ++virtualRegion.cheatAffect;
} }
template<typename stepType, typename compareType> template<typename stepType, typename compareType>
@ -541,10 +540,10 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (isSigned \ ? (isSigned \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, signed long>() \ ? functionName<long, signed long>() \
: functionName<char, signed long>()) \ : functionName<char, signed long>()) \
: (requiresAligned \ : (requiresAligned \
? functionName<short, unsigned long>() \ ? functionName<long, unsigned long>() \
: functionName<char, unsigned long>())) \ : functionName<char, unsigned long>())) \
: functionName<char, signed char>()) : functionName<char, signed char>())
@ -564,10 +563,10 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (isSigned \ ? (isSigned \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, signed long>(p0) \ ? functionName<long, signed long>(p0) \
: functionName<char, signed long>(p0)) \ : functionName<char, signed long>(p0)) \
: (requiresAligned \ : (requiresAligned \
? functionName<short, unsigned long>(p0) \ ? functionName<long, unsigned long>(p0) \
: functionName<char, unsigned long>(p0))) \ : functionName<char, unsigned long>(p0))) \
: functionName<char, signed char>(p0)) : functionName<char, signed char>(p0))
@ -587,10 +586,10 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (isSigned \ ? (isSigned \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, signed long>(p0, p1, p2) \ ? functionName<long, signed long>(p0, p1, p2) \
: functionName<char, signed long>(p0, p1, p2)) \ : functionName<char, signed long>(p0, p1, p2)) \
: (requiresAligned \ : (requiresAligned \
? functionName<short, unsigned long>(p0, p1, p2) \ ? functionName<long, unsigned long>(p0, p1, p2) \
: functionName<char, unsigned long>(p0, p1, p2))) \ : functionName<char, unsigned long>(p0, p1, p2))) \
: functionName<char, signed char>(p0, p1, p2)) : functionName<char, signed char>(p0, p1, p2))
@ -610,10 +609,10 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (isSigned \ ? (isSigned \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, signed long>(p0, p1, p2, p3) \ ? functionName<long, signed long>(p0, p1, p2, p3) \
: functionName<char, signed long>(p0, p1, p2, p3)) \ : functionName<char, signed long>(p0, p1, p2, p3)) \
: (requiresAligned \ : (requiresAligned \
? functionName<short, unsigned long>(p0, p1, p2, p3) \ ? functionName<long, unsigned long>(p0, p1, p2, p3) \
: functionName<char, unsigned long>(p0, p1, p2, p3))) \ : functionName<char, unsigned long>(p0, p1, p2, p3))) \
: functionName<char, signed char>(p0, p1, p2, p3)) : functionName<char, signed char>(p0, p1, p2, p3))
@ -627,7 +626,7 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: functionName<char, type>(p0, p1, p2)) \ : functionName<char, type>(p0, p1, p2)) \
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, type>(p0, p1, p2) \ ? functionName<long, type>(p0, p1, p2) \
: functionName<char, type>(p0, p1, p2)) \ : functionName<char, type>(p0, p1, p2)) \
: functionName<char, type>(p0, p1, p2)) : functionName<char, type>(p0, p1, p2))
@ -641,7 +640,7 @@ unsigned int HardwareAddressToItemIndex(HWAddressType hardwareAddress)
: functionName<char, type>(p0, p1, p2, p3)) \ : functionName<char, type>(p0, p1, p2, p3)) \
: sizeTypeID == 'd' \ : sizeTypeID == 'd' \
? (requiresAligned \ ? (requiresAligned \
? functionName<short, type>(p0, p1, p2, p3) \ ? functionName<long, type>(p0, p1, p2, p3) \
: functionName<char, type>(p0, p1, p2, p3)) \ : functionName<char, type>(p0, p1, p2, p3)) \
: functionName<char, type>(p0, p1, p2, p3)) : functionName<char, type>(p0, p1, p2, p3))

2
src/drivers/win/window.cpp
View File

@ -2912,7 +2912,7 @@ struct HOTKEYMENUINDEX hotkeyMenuIndexes[] = {
// "Close ROM" // "Close ROM"
{ FCEU_CONTEXT_CLOSEROM,EMUCMD_CLOSEROM,MENU_BELONG(CONTEXT_GAME) }, { FCEU_CONTEXT_CLOSEROM,EMUCMD_CLOSEROM,MENU_BELONG(CONTEXT_GAME) },
// "&Load State" // "&Load State"
{ MENU_LOADSTATE,EMUCMD_LOAD_STATE,MENU_BELONG(CONTEXT_GAME) }, { MENU_LOADSTATE,EMUCMD_LOAD_STATE },
// "&Save State" // "&Save State"
{ MENU_SAVESTATE,EMUCMD_SAVE_STATE }, { MENU_SAVESTATE,EMUCMD_SAVE_STATE },
// "Load State &From..." // "Load State &From..."