Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 17:08:28 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
dankan1890 2016-01-31 00:59:23 +01:00
commit 0f4b6b0e46
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/luaengine.cpp
View File

@ -848,7 +848,7 @@ void lua_engine::serve_lua()
// Do action on client side // Do action on client side
{ {
osd_sleep(osd_ticks_per_second() / 1000); std::lock_guard<std::mutex> lock(g_mutex);
if (msg.status == -1) { if (msg.status == -1) {
b = LUA_PROMPT2; b = LUA_PROMPT2;

1
src/mame/drivers/hh_tms1k.cpp
View File

@ -65,6 +65,7 @@
@M34012 TMS1100 1980, Mattel Dungeons & Dragons - Computer Labyrinth Game @M34012 TMS1100 1980, Mattel Dungeons & Dragons - Computer Labyrinth Game
*M34014 TMS1100 1981, Coleco Bowlatronic *M34014 TMS1100 1981, Coleco Bowlatronic
M34017 TMS1100 1981, MicroVision cartridge: Cosmic Hunter M34017 TMS1100 1981, MicroVision cartridge: Cosmic Hunter
*M34038 TMS1100 1982, Parker Brothers Lost Treasure
M34047 TMS1100 1982, MicroVision cartridge: Super Blockbuster M34047 TMS1100 1982, MicroVision cartridge: Super Blockbuster
*M34078A TMS1100 1983, Milton Bradley Arcade Mania *M34078A TMS1100 1983, Milton Bradley Arcade Mania
@MP6100A TMS0980 1979, Ideal Electronic Detective @MP6100A TMS0980 1979, Ideal Electronic Detective