From 662574c5138c0bc3229185126da617eb01a739ac Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Wed, 20 Nov 2013 10:13:56 -0500 Subject: [PATCH] shorten super long error messages in ram_check --- src/freespace2/freespace.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/freespace2/freespace.cpp b/src/freespace2/freespace.cpp index e01acf6..60bf658 100644 --- a/src/freespace2/freespace.cpp +++ b/src/freespace2/freespace.cpp @@ -6764,7 +6764,7 @@ void game_do_state(int state) // return 0 if there is enough RAM to run FreeSpace, otherwise return -1 int game_do_ram_check(int ram_in_mbytes) { - if ( ram_in_mbytes < 30 ) { + if ( ram_in_mbytes < 30 ) { int allowed_to_run = 1; if ( ram_in_mbytes < 25 ) { allowed_to_run = 0; @@ -6777,7 +6777,10 @@ int game_do_ram_check(int ram_in_mbytes) SDL_MessageBoxButtonData mboxbuttons[2]; int msgbox_rval; - sprintf( tmp, XSTR( "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run. If you think you have more than %dMB of physical memory, ensure that you aren't running SmartDrive (SMARTDRV.EXE). Any memory allocated to SmartDrive is not usable by applications\n\nPress 'OK' to continue running with less than the minimum required memory\n", 193), ram_in_mbytes, ram_in_mbytes); + // not a translated string, but it's too long and smartdrv isn't + // really a thing for any OS we now support :p + // sprintf( tmp, XSTR( "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run. If you think you have more than %dMB of physical memory, ensure that you aren't running SmartDrive (SMARTDRV.EXE). Any memory allocated to SmartDrive is not usable by applications\n\nPress 'OK' to continue running with less than the minimum required memory\n", 193), ram_in_mbytes, ram_in_mbytes); + sprintf( tmp, "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run.\n\nPress 'OK' to continue running with less than the minimum required memory.\n", ram_in_mbytes, ram_in_mbytes); mboxbuttons[0].buttonid = 0; mboxbuttons[0].text = XSTR("Ok", 503); @@ -6801,7 +6804,10 @@ int game_do_ram_check(int ram_in_mbytes) return -1; } } else { - sprintf( tmp, XSTR( "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run. If you think you have more than %dMB of physical memory, ensure that you aren't running SmartDrive (SMARTDRV.EXE). Any memory allocated to SmartDrive is not usable by applications\n", 195), ram_in_mbytes, ram_in_mbytes); + // not a translated string, but it's too long and smartdrv isn't + // really a thing for any OS we now support :p + // sprintf( tmp, XSTR( "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run. If you think you have more than %dMB of physical memory, ensure that you aren't running SmartDrive (SMARTDRV.EXE). Any memory allocated to SmartDrive is not usable by applications\n", 195), ram_in_mbytes, ram_in_mbytes); + sprintf( tmp, "FreeSpace has detected that you only have %dMB of free memory.\n\nFreeSpace requires at least 32MB of memory to run.\n", ram_in_mbytes, ram_in_mbytes); SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, XSTR( "Not Enough RAM", 194), tmp, NULL); -- 2.39.2