Merge pull request #6 from Emu-gators/sphang

Sphang

output/luaScripts/closeRom.lua

@@ -1,2 +1,7 @@
+while true do
+local inpt = input.read()
+emu.frameadvance()
 emu.closeRom()
-emu.print("ROM Unloaded")
+emugator.yieldwithflag()
+end
+

output/luaScripts/emugator/emugators_demo.lua

@@ -0,0 +1,49 @@
+	emu.print("Go Gators!")
+	local cart = {x1=50, y1=50, x2=100, y2=100}
+	local console = {x1=150, y1=50, x2=200, y2=100}
+	local unloadButton = {x1 = 220, y1 = 220, x2 = 250, y2 = 230}
+	local isDrag = false
+	--local gd = require("gd")
+
+while(true) do
+	--need gd for this
+		--local gdstr = gd.createFromPng("C:\Users\Super\Emugators\fceux\output\luaScripts\emugator\nesRomGeneric.png"):gdStr()
+		--gui.gdoverlay(gdstr) 
+	local inpt = input.read()
+
+	if(emu.emulating() == false) then
+		if (inpt.leftclick == nil) then
+			if ((inpt.xmouse > console.x1) and (inpt.xmouse < console.x2) and (inpt.ymouse > console.y1) and (inpt.ymouse < console.y2) and isDrag) then
+				emu.loadrom("superMario.nes")
+			end
+			isDrag = false
+		end
+
+		if isDrag then
+			gui.rect(inpt.xmouse, inpt.ymouse, inpt.xmouse+50, inpt.ymouse+50, "red", "white")
+			gui.text(inpt.xmouse + 12, inpt.ymouse+12, "Super\nMario\nBros.")
+		elseif ((inpt.xmouse > cart.x1) and (inpt.xmouse < cart.x2) and (inpt.ymouse > cart.y1) and (inpt.ymouse < cart.y2) and inpt.leftclick) then
+			isDrag = true
+		else
+			gui.rect(cart.x1, cart.y1, cart.x2, cart.y2, "gray", "white")
+			gui.text(cart.x1 + 12, cart.y1 + 12, "Super\nMario\nBros.")
+		end
+
+		gui.rect(console.x1, console.y1, console.x2, console.y2, "blue", "white")
+		gui.text(console.x1 + 9, console.y1 + 16, "Famicom\n/NES")
+
+		emugator.yieldwithflag() -- call this if you want the script to run without emulation (game running)
+	else
+		gui.rect(unloadButton.x1, unloadButton.y1, unloadButton.x2, unloadButton.y2, "blue", "white")
+		gui.text(unloadButton.x1+2, unloadButton.y1+2, "Unload")
+
+		if ((inpt.xmouse > unloadButton.x1) and (inpt.xmouse < unloadButton.x2) and (inpt.ymouse > unloadButton.y1) and (inpt.ymouse < unloadButton.y2) and inpt.leftclick) then
+			emu.closeRom()
+			emugator.yieldwithflag()
+		else
+			emu.frameadvance()
+		end
+	end
+
+	--emu.frameadvance()
+end

src/fceu.cpp

@@ -804,6 +804,9 @@ void FCEUI_Emulate(uint8 **pXBuf, int32 **SoundBuf, int32 *SoundBufSize, int ski
 	FCEU_LuaFrameBoundary();
 #endif
 
+	if (!GameInfo)
+		return;
+
 	FCEU_UpdateInput();
 	lagFlag = 1;
 

src/lua-engine.cpp

@@ -5473,9 +5473,6 @@ static int emugator_yieldwithflag(lua_State* L)
 	luaYieldFlag = true;
 
 	return lua_yield(L, 0);
-
-
-	// It's actually rather disappointing...
 }