Fix Corina (and other size-based) bin loading

Fixes atari800#258 but Bomb Jake cartridge still just boots into Self Test.

Author: mikrosk

DOC/cart.txt

@@ -115,8 +115,8 @@ Currently supported cartridge types:
 | 81 | 800/XL/XE |   64 | MDDOS cartridge                               | x |
 | 82 | 800/XL/XE |   32 | COS32 cartridge                               | x |
 | 83 | 800/XL/XE | 1024 | SIC+ 1024 KB cartridge                        | x |
-| 84 | 800/XL/XE | 1024 | Corina 1M+8K EEPROM                           | x |
-| 85 | 800/XL/XE |  512 | Corina 512K + 512K SRAM + 8K EEPROM           | x |
+| 84 | 800/XL/XE | 1032 | Corina 1M+8K EEPROM                           | x |
+| 85 | 800/XL/XE |  520 | Corina 512K + 512K SRAM + 8K EEPROM           | x |
 | 86 | 800/XL/XE |    8 | XE Multicart (8KB)                            | x |
 | 87 | 800/XL/XE |   16 | XE Multicart (16KB)                           | x |
 | 88 | 800/XL/XE |   32 | XE Multicart (32KB)                           | x |

src/cartridge_info.c

@@ -111,8 +111,8 @@ cart_t const CARTRIDGES[CARTRIDGE_TYPE_COUNT] = {
 	{ "MDDOS cartridge",                          64 },
 	{ "COS32 cartridge",                          32 },
 	{ "SIC+ 1024 KB cartridge",                 1024 },
-	{ "Corina 1M + 8K EEPROM cartridge",        1024 },
-	{ "Corina 512K + 512K SRAM + 8K EEPROM cartridge", 512 },
+	{ "Corina 1M + 8K EEPROM cartridge",        1024+8 },
+	{ "Corina 512K + 512K SRAM + 8K EEPROM cartridge", 512+8 },
 	{ "XE Multicart (8KB) cartridge",              8 },
 	{ "XE Multicart (16KB) cartridge",            16 },
 	{ "XE Multicart (32KB) cartridge",            32 },

src/ui.c

@@ -1235,7 +1235,7 @@ static void CartManagement(void)
 					break;
 				}
 
-				cart.type = UI_SelectCartType(kb);
+				cart.type = UI_SelectCartType(cart.size);
 				if (cart.type == CARTRIDGE_NONE) {
 					free(cart.image);
 					break;
@@ -1246,7 +1246,7 @@ static void CartManagement(void)
 					break;
 				}
 
-				error = CARTRIDGE_WriteImage(cart_filename, cart.type, cart.image, kb << 10, FALSE, -1);
+				error = CARTRIDGE_WriteImage(cart_filename, cart.type, cart.image, cart.size << 10, FALSE, -1);
 				free(cart.image);
 				if (error)
 					CantSave(cart_filename);