--- BasiliskII/src/AmigaOS/main_amiga.cpp 2000/08/20 14:08:41 1.9 +++ BasiliskII/src/AmigaOS/main_amiga.cpp 2000/09/04 16:30:47 1.10 @@ -75,8 +75,6 @@ uint32 ROMBaseMac; // ROM base (Mac add uint8 *ROMBaseHost; // ROM base (host address space) uint32 ROMSize; // Size of ROM -uint32 MacsBugFlags = 0xbff; - // CPU and FPU type, addressing mode int CPUType; @@ -245,18 +243,13 @@ int main(void) RAMSize = 1024*1024; } RAMBaseHost = (uint8 *)AllocVec(RAMSize + 0x100000, MEMF_PUBLIC); -// if (RAMBaseHost == NULL) { -// ErrorAlert(GetString(STR_NO_MEM_ERR)); -// QuitEmulator(); -// } - if (RAMBaseHost == NULL) - { + if (RAMBaseHost == NULL) { uint32 newRAMSize = AvailMem(MEMF_LARGEST) - 0x100000; char xText[120]; sprintf(xText, GetString(STR_NOT_ENOUGH_MEM_WARN), RAMSize, newRAMSize); - if (1 != ChoiceAlert(xText, "Use", "Quit")) + if (ChoiceAlert(xText, "Use", "Quit") != 1) QuitEmulator(); RAMSize = newRAMSize; @@ -265,7 +258,7 @@ int main(void) ErrorAlert(GetString(STR_NO_MEM_ERR)); QuitEmulator(); } - } + } RAMBaseMac = (uint32)RAMBaseHost; D(bug("Mac RAM starts at %08lx\n", RAMBaseHost)); ROMBaseHost = RAMBaseHost + RAMSize; @@ -332,7 +325,7 @@ int main(void) // Set task priority to -1 so we don't use all processing time SetTaskPri(MainTask, -1); - WriteMacInt32(MacsBugFlags, 0); + WriteMacInt32(0xbff, 0); // MacsBugFlags // Swap stack to Mac RAM area stack_swap.stk_Lower = RAMBaseHost;