Skip to content

Commit fd82936

Browse files
ejaquayejaquay
authored andcommitted
Change version to 2.1.9.3-pre2 other minor fixes
Version set to pre-release 2 Fix 'X' for non DLL carts in mpi config Fix mis-spelling in sdc.cpp
1 parent b515eb4 commit fd82936

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

Vcc.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
146146
BEGIN
147147
CONTROL IDB_VCC,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE,8,5,217,45
148148
CONTROL IDB_3GUYS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,16,53,77,57,WS_EX_DLGMODALFRAME
149-
LTEXT "VCC Version 2.1.9.3-pre1",IDC_STATIC,114,65,85,10
149+
LTEXT "VCC Version 2.1.9.3-pre2",IDC_STATIC,114,65,85,10
150150
LTEXT "Another classic computer canceled before it's time!",IDC_STATIC,114,80,85,20
151151
LTEXT "Copyright 2015 By Joseph Forgione",IDC_STATIC,8,120,120,15
152152
LTEXT "VCC (Virtual Color Computer) is free software: you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.",IDC_STATIC,8,135,210,35
@@ -825,7 +825,7 @@ END
825825

826826
STRINGTABLE
827827
BEGIN
828-
IDS_APP_TITLE "VCC 2.1.9.3-pre1 Tandy Color Computer 3 Emulator"
828+
IDS_APP_TITLE "VCC 2.1.9.3-pre2 Tandy Color Computer 3 Emulator"
829829
IDS_CATNUMBER "26-3334"
830830
END
831831

mpi/mpi.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ static unsigned int BankedCartOffset[NUMSLOTS]={0,0,0,0};
5151
static char IniFile[MAX_PATH]="";
5252
static char MPIPath[MAX_PATH];
5353

54-
5554
//**************************************************************
5655
//Array of fuction pointer for each Slot
5756
static void (*GetModuleNameCalls[NUMSLOTS])(char *,char *,DYNAMICMENUCALLBACK)={NULL,NULL,NULL,NULL};
@@ -404,12 +403,12 @@ LRESULT CALLBACK MpiConfigDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
404403
case WM_INITDIALOG:
405404
hConfDlg=hDlg;
406405
CenterDialog(hDlg);
407-
for (int slot=0;slot<NUMSLOTS;slot++) {
408-
SendDlgItemMessage(hDlg,EDITBOXS[slot],WM_SETTEXT,0,(LPARAM)SlotLabel[slot]);
409-
if (hinstLib[slot])
410-
SendDlgItemMessage(hDlg,INSBOXS[slot],WM_SETTEXT,0,(LPARAM)"X");
406+
for (int Slot=0;Slot<NUMSLOTS;Slot++) {
407+
SendDlgItemMessage(hDlg,EDITBOXS[Slot],WM_SETTEXT,0,(LPARAM)SlotLabel[Slot]);
408+
if ((strcmp(ModuleNames[Slot],"Empty") != 0) || hinstLib[Slot])
409+
SendDlgItemMessage(hDlg,INSBOXS[Slot],WM_SETTEXT,0,(LPARAM)"X");
411410
else
412-
SendDlgItemMessage(hDlg,INSBOXS[slot],WM_SETTEXT,0,(LPARAM)">");
411+
SendDlgItemMessage(hDlg,INSBOXS[Slot],WM_SETTEXT,0,(LPARAM)">");
413412
}
414413
UpdateSlotSelect(SwitchSlot);
415414
return TRUE;
@@ -481,14 +480,14 @@ void UpdateSlotSelect(int slot)
481480
PakSetCart(0);
482481
}
483482

484-
void UpdateSlotContent(int slot)
483+
void UpdateSlotContent(int Slot)
485484
{
486-
UpdateCartDLL(slot,ModulePaths[slot]);
487-
SendDlgItemMessage(hConfDlg,EDITBOXS[slot],WM_SETTEXT,0,(LPARAM)SlotLabel[slot]);
488-
if (hinstLib[slot])
489-
SendDlgItemMessage(hConfDlg,INSBOXS[slot],WM_SETTEXT,0,(LPARAM)"X");
485+
UpdateCartDLL(Slot,ModulePaths[Slot]);
486+
SendDlgItemMessage(hConfDlg,EDITBOXS[Slot],WM_SETTEXT,0,(LPARAM)SlotLabel[Slot]);
487+
if ((strcmp(ModuleNames[Slot],"Empty") != 0) || hinstLib[Slot])
488+
SendDlgItemMessage(hConfDlg,INSBOXS[Slot],WM_SETTEXT,0,(LPARAM)"X");
490489
else
491-
SendDlgItemMessage(hConfDlg,INSBOXS[slot],WM_SETTEXT,0,(LPARAM)">");
490+
SendDlgItemMessage(hConfDlg,INSBOXS[Slot],WM_SETTEXT,0,(LPARAM)">");
492491
BuildDynaMenu();
493492
return;
494493
}
@@ -641,7 +640,7 @@ void UpdateCartDLL(unsigned char Slot,char *DllPath)
641640
OPENFILENAME ofn ;
642641
unsigned char RetVal=0;
643642

644-
if (hinstLib[Slot] !=NULL) {
643+
if ((strcmp(ModuleNames[Slot],"Empty") != 0) || hinstLib[Slot]) {
645644
UnloadModule(Slot);
646645
} else {
647646
memset(&ofn,0,sizeof(ofn));

sdc/sdc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ void UpdateFlashItem(void)
772772

773773
OPENFILENAME ofn ;
774774
strncpy(filename,FlashFile[index],MAX_PATH);
775-
// DeDanitize
775+
// DeSanitize
776776
for(unsigned int i=0; i<strlen(filename); i++) {
777777
if (filename[i] == '/') filename[i] = '\\';
778778
}

0 commit comments

Comments
 (0)