fmtowns_cd: hand fix rbisland (nw)

load_dat.lua: fix crlf issue (nw)
selsoft: fix off-by-one crash (nw)
This commit is contained in:
cracyc 2017-12-20 21:16:32 -06:00
parent ffad25e0e7
commit da0c536130
3 changed files with 5 additions and 5 deletions

View File

@ -7786,8 +7786,8 @@ User/save disks that can be created from the game itself are not included.
</software> </software>
<!-- <!--
This image is missing the IPL data in sector 0. It's possible to run AUTOEXEC.BAT The orginal img file is missing the IPL data in sector 0. This one has it injected
manually from TownsOS, but it should be considered a bad dump. from a working image. To recreate the img, fill the first two sectors with 'U'.
--> -->
<software name="rbisland"> <software name="rbisland">
<!-- <!--
@ -7803,7 +7803,7 @@ User/save disks that can be created from the game itself are not included.
<info name="release" value="199204xx" /> <info name="release" value="199204xx" />
<part name="cdrom" interface="fmt_cdrom"> <part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom"> <diskarea name="cdrom">
<disk name="rainbow islands extra" sha1="2c480a769d0f0340ab2c26988b5d37404606dc7e" status="baddump" /> <disk name="rainbow islands extra" sha1="5dc2afbffca0ccdeba87d036ddcf5e53ad9df8f2" status="baddump" />
</diskarea> </diskarea>
</part> </part>
</software> </software>

View File

@ -91,7 +91,7 @@ function datfile.open(file, vertag, fixupcb)
local function iter() local function iter()
local tag1, tag2, data, start, inblock = false local tag1, tag2, data, start, inblock = false
while not data do while not data do
local spos, epos, match = buffer:find("\n($[^\n]*)", pos) local spos, epos, match = buffer:find("\n($[^\n\r]*)", pos)
if not spos then if not spos then
return nil return nil
end end

View File

@ -158,7 +158,7 @@ void menu_select_software::handle()
ui_globals::switch_image = true; ui_globals::switch_image = true;
ui_globals::default_image = false; ui_globals::default_image = false;
} }
else if (ui_globals::rpanel == RP_INFOS && ui_globals::cur_sw_dats_view < ui_globals::cur_sw_dats_total) else if (ui_globals::rpanel == RP_INFOS && ui_globals::cur_sw_dats_view < (ui_globals::cur_sw_dats_total - 1))
{ {
// Infos // Infos
ui_globals::cur_sw_dats_view++; ui_globals::cur_sw_dats_view++;