Skip to content

Commit 7421c44

Browse files
committed
Files for 281
1 parent f91add8 commit 7421c44

File tree

15 files changed

+74
-59
lines changed

15 files changed

+74
-59
lines changed

docs/release/build/e.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@edit src\mame\mame.lst

docs/release/build/uprel.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
\goto end
22
git fetch upstream
3-
git merge upstream/release0280
3+
git merge upstream/release0281
44
git checkout master
55
:end
66
pause

docs/release/build/v.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
mameui -validate
1+
@echo off
2+
echo Please wait...
3+
mameui -validate > x 2>&1
4+
type x
25
xmllint --noout -valid hash/*.xml 2>&1
36
xmllint --noout -valid hash/more/*.xml 2>&1

docs/release/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
###########################################################################
88

9-
BARE_VERS := 0.280
9+
BARE_VERS := 0.281
1010
LONG_VERS := $(BARE_VERS).0
1111

1212
###########################################################################

docs/release/scripts/src/main.lua

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,24 @@ end
5050
}
5151

5252
if _OPTIONS["SYMBOLS"] then
53+
local llvm_obdjump = false
54+
local objdump_ver = backtick('objdump --version')
55+
if string.match(objdump_ver, 'LLVM version ') then
56+
llvm_obdjump = true
57+
end
58+
5359
configuration { "mingw*" }
54-
postbuildcommands {
55-
"$(SILENT) echo Dumping symbols.",
56-
"$(SILENT) objdump --section=.text --line-numbers --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))"
57-
}
60+
if llvm_obdjump then
61+
postbuildcommands {
62+
"$(SILENT) echo Dumping symbols.",
63+
"$(SILENT) " .. PYTHON .. " " .. MAME_DIR .. "scripts/build/llvm-objdump-filter.py $(TARGET) | c++filt >$(subst .exe,.sym,$(TARGET))"
64+
}
65+
else
66+
postbuildcommands {
67+
"$(SILENT) echo Dumping symbols.",
68+
"$(SILENT) objdump --section=.text --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))"
69+
}
70+
end
5871
end
5972

6073
configuration { "Release" }

docs/release/scripts/src/osd/modules.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ function qtdebuggerbuild()
405405
MOC = "moc"
406406
else
407407
if _OPTIONS["QT_HOME"]~=nil then
408-
MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
409-
if (MOCTST=='') then
408+
local MOCTST = backtick(_OPTIONS["QT_HOME"] .. "/bin/moc --version 2>/dev/null")
409+
if MOCTST=='' then
410410
local qt_host_libexecs = backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_HOST_LIBEXECS")
411411
if not string.starts(qt_host_libexecs,"/") then
412412
qt_host_libexecs = _OPTIONS["QT_HOME"] .. "/libexec"
@@ -422,8 +422,8 @@ function qtdebuggerbuild()
422422
MOC = _OPTIONS["QT_HOME"] .. "/bin/moc"
423423
end
424424
else
425-
MOCTST = backtick("which moc-qt5 2>/dev/null")
426-
if (MOCTST=='') then
425+
local MOCTST = backtick("which moc-qt5 2>/dev/null")
426+
if MOCTST=='' then
427427
MOCTST = backtick("which moc 2>/dev/null")
428428
end
429429
if MOCTST=='' then

docs/release/src/devices/imagedev/floppy.cpp

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -248,33 +248,33 @@ floppy_image_device *floppy_connector::get_device()
248248
// floppy_image_device - constructor
249249
//-------------------------------------------------
250250

251-
floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
252-
: device_t(mconfig, type, tag, owner, clock),
253-
device_image_interface(mconfig, *this),
254-
m_input_format(nullptr),
255-
m_output_format(nullptr),
256-
m_image(),
257-
m_index_timer(nullptr),
258-
m_tracks(0),
259-
m_sides(0),
260-
m_form_factor(0),
261-
m_sectoring_type(floppy_image::SOFT),
262-
m_motor_always_on(false),
263-
m_dskchg_writable(false),
264-
m_has_trk00_sensor(true),
265-
m_dir(0), m_stp(0), m_wtg(0), m_mon(0), m_ss(0), m_ds(-1), m_idx(0), m_wpt(0), m_rdy(0), m_dskchg(0),
266-
m_ready(false),
267-
m_rpm(0),
268-
m_angular_speed(0),
269-
m_revolution_count(0),
270-
m_cyl(0),
271-
m_subcyl(0),
272-
m_amplifier_freakout_time(attotime::from_usec(16)),
273-
m_image_dirty(false),
274-
m_track_dirty(false),
275-
m_ready_counter(0),
276-
m_make_sound(true), // MESSUI, Robbbert, default floppy sound on
277-
m_sound_out(nullptr)
251+
floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
252+
device_t(mconfig, type, tag, owner, clock),
253+
device_image_interface(mconfig, *this),
254+
m_input_format(nullptr),
255+
m_output_format(nullptr),
256+
m_image(),
257+
m_index_timer(nullptr),
258+
m_tracks(0),
259+
m_sides(0),
260+
m_form_factor(0),
261+
m_sectoring_type(floppy_image::SOFT),
262+
m_motor_always_on(false),
263+
m_dskchg_writable(false),
264+
m_has_trk00_sensor(true),
265+
m_dir(0), m_stp(0), m_wtg(0), m_mon(1), m_ss(0), m_ds(-1), m_idx(0), m_wpt(0), m_rdy(0), m_dskchg(0),
266+
m_ready(false),
267+
m_rpm(0),
268+
m_angular_speed(0),
269+
m_revolution_count(0),
270+
m_cyl(0),
271+
m_subcyl(0),
272+
m_amplifier_freakout_time(attotime::from_usec(16)),
273+
m_image_dirty(false),
274+
m_track_dirty(false),
275+
m_ready_counter(0),
276+
m_make_sound(true), // MESSUI, Robbbert, default floppy sound on
277+
m_sound_out(nullptr)
278278
{
279279
m_extension_list[0] = '\0';
280280
}
@@ -528,7 +528,7 @@ void floppy_image_device::device_start()
528528

529529
m_cyl = 0;
530530
m_subcyl = 0;
531-
m_ss = 0;
531+
m_ss = 0;
532532
m_actual_ss = 0;
533533
m_ds = -1;
534534
m_stp = 1;
@@ -540,7 +540,6 @@ void floppy_image_device::device_start()
540540
m_ready_counter = 0;
541541
m_phases = 0;
542542

543-
544543
if (m_make_sound) m_sound_out = subdevice<floppy_sound_device>(FLOPSND_TAG);
545544

546545
save_item(NAME(m_dir));
@@ -656,9 +655,9 @@ std::pair<std::error_condition, std::string> floppy_image_device::call_load()
656655
const floppy_image_format_t *best_format = nullptr;
657656
for (const floppy_image_format_t *format : m_fif_list) {
658657
int score = format->identify(*io, m_form_factor, m_variants);
659-
if(score && format->extension_matches(filename()))
658+
if (score && format->extension_matches(filename()))
660659
score |= floppy_image_format_t::FIFID_EXT;
661-
if(score > best) {
660+
if (score > best) {
662661
best = score;
663662
best_format = format;
664663
}
@@ -672,6 +671,11 @@ std::pair<std::error_condition, std::string> floppy_image_device::call_load()
672671
m_image.reset();
673672
return std::make_pair(image_error::INVALIDIMAGE, "Incompatible image file format or corrupted data");
674673
}
674+
675+
char const *const wp = get_feature("write_protected");
676+
if (wp && !std::strcmp(wp, "true"))
677+
make_readonly();
678+
675679
m_output_format = is_readonly() ? nullptr : best_format;
676680

677681
m_image_dirty = false;

docs/release/src/emu/diimage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ static int verify_length_and_hash(emu_file *file, std::string_view name, u32 exp
727727
else if (hashes.flag(util::hash_collection::FLAG_BAD_DUMP))
728728
{
729729
// If it matches, but it is actually a bad dump, write it
730-
osd_printf_error("%s NEEDS REDUMP\n",name);
730+
osd_printf_info("%s NEEDS REDUMP\n",name);
731731
}
732732
return retval;
733733
}

docs/release/src/mame/galaxian/119.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ The hardware is quite Galaxian-like (background + sprites + bullets) but tiles
2626
are 3bpp, not 2bpp, and there is extra sound hardware. The hardware is outdated
2727
for 1986, it's rumoured that the game is actually from 1983 (see Sega PCB label).
2828
29+
Coreland / Sega Bopeep (also from 1986, a Gunjin Shogi game) is on the same PCB.
30+
2931
TODO:
3032
- Sometimes killed by something invisible at the top-right of the 1st stage? It's
3133
not a hidden sprite, and whatever's there can't be defeated by spraying water.

docs/release/src/mame/galaxian/galaxian.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8921,6 +8921,7 @@ void gmgalax_state::init_gmgalax()
89218921
common_init(nullptr, nullptr, nullptr, nullptr);
89228922
m_extend_tile_info_ptr = extend_tile_info_delegate(&gmgalax_state::bagmanmc_extend_tile_info, this);
89238923
m_extend_sprite_info_ptr = extend_sprite_info_delegate(&gmgalax_state::bagmanmc_extend_sprite_info, this);
8924+
m_leftspriteclip = 8;
89248925
}
89258926

89268927

0 commit comments

Comments
 (0)