Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-03-10 16:53:55 +00:00
Code Issues Projects Releases Wiki Activity

Prevent both U1 & U2 cards being inserted at same time

Browse Source
This commit is contained in:
tomcw
2025-11-23 16:11:41 +00:00
parent b3baaa957f
commit 2430679ffe
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/CardManager.cpp
View File

@@ -399,13 +399,10 @@ void CardManager::GetCardChoicesForSlot(const UINT slot, const SS_CARDTYPE currC
BYTE haveCard[CT_NUM_CARDS];
memset(haveCard, kInvalidSlot, sizeof(haveCard));
for (UINT i = SLOT0; i < NUM_SLOTS; i++)
for (int i = SLOT0; i < NUM_SLOTS; i++)
{
if (IsSingleInstanceCard(currConfig[i]))
{
haveCard[currConfig[i]] = i;
break;
}
}
for (UINT i = 0; i < sizeof(cards) / sizeof(cards[0]); i++)
@@ -415,6 +412,12 @@ void CardManager::GetCardChoicesForSlot(const UINT slot, const SS_CARDTYPE currC
if (thisCard == CT_VidHD && slot != SLOT3)
continue;
// Prevent both Uthernet & Uthernet2 cards being plugged in at the same time
if (thisCard == CT_Uthernet && haveCard[CT_Uthernet2] != kInvalidSlot && haveCard[CT_Uthernet2] != slot)
continue; // Already have a Uthernet2 card selected in another slot, so prevent Uthernet
if (thisCard == CT_Uthernet2 && haveCard[CT_Uthernet] != kInvalidSlot && haveCard[CT_Uthernet] != slot)
continue; // Already have a Uthernet card selected in another slot, so prevent Uthernet2
if (IsSingleInstanceCard(thisCard) && haveCard[thisCard] != kInvalidSlot && haveCard[thisCard] != slot)
continue;

2
source/Configuration/PageSound.cpp
View File

@@ -209,7 +209,7 @@ int CPageSound::CardTypeToComboItem(UINT slot)
void CPageSound::InitOptions(HWND hWnd)
{
SS_CARDTYPE currConfig[NUM_SLOTS];
for (UINT i = SLOT0; i < NUM_SLOTS; i++)
for (int i = SLOT0; i < NUM_SLOTS; i++)
currConfig[i] = m_PropertySheetHelper.GetConfigNew().m_Slot[i];
if (IsApple2PlusOrClone(GetApple2Type()))