summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2017-12-20 21:16:32 -0600
committer cracyc <cracyc@users.noreply.github.com>2017-12-20 21:16:32 -0600
commitda0c536130cb3b45c7f35d57eb05ced5d8017be5 (patch)
tree0bf45485eda0f185f3e02c67c3a87a72a830c393
parentffad25e0e7e4b86995491dec41a2ec6c57a5dec5 (diff)
fmtowns_cd: hand fix rbisland (nw)
load_dat.lua: fix crlf issue (nw) selsoft: fix off-by-one crash (nw)
-rw-r--r--hash/fmtowns_cd.xml6
-rw-r--r--plugins/data/load_dat.lua2
-rw-r--r--src/frontend/mame/ui/selsoft.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml
index acd3fd89e9e..bf329ad2f0b 100644
--- a/hash/fmtowns_cd.xml
+++ b/hash/fmtowns_cd.xml
@@ -7786,8 +7786,8 @@ User/save disks that can be created from the game itself are not included.
</software>
<!--
- This image is missing the IPL data in sector 0. It's possible to run AUTOEXEC.BAT
- manually from TownsOS, but it should be considered a bad dump.
+ The orginal img file is missing the IPL data in sector 0. This one has it injected
+ from a working image. To recreate the img, fill the first two sectors with 'U'.
-->
<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" />
<part name="cdrom" interface="fmt_cdrom">
<diskarea name="cdrom">
- <disk name="rainbow islands extra" sha1="2c480a769d0f0340ab2c26988b5d37404606dc7e" status="baddump" />
+ <disk name="rainbow islands extra" sha1="5dc2afbffca0ccdeba87d036ddcf5e53ad9df8f2" status="baddump" />
</diskarea>
</part>
</software>
diff --git a/plugins/data/load_dat.lua b/plugins/data/load_dat.lua
index d1d57093d47..fd53b610d4a 100644
--- a/plugins/data/load_dat.lua
+++ b/plugins/data/load_dat.lua
@@ -91,7 +91,7 @@ function datfile.open(file, vertag, fixupcb)
local function iter()
local tag1, tag2, data, start, inblock = false
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
return nil
end
diff --git a/src/frontend/mame/ui/selsoft.cpp b/src/frontend/mame/ui/selsoft.cpp
index 5e7a46ad156..e7ebc3effa2 100644
--- a/src/frontend/mame/ui/selsoft.cpp
+++ b/src/frontend/mame/ui/selsoft.cpp
@@ -158,7 +158,7 @@ void menu_select_software::handle()
ui_globals::switch_image = true;
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
ui_globals::cur_sw_dats_view++;