Merge branch 'master' into angle-meld

Author: Wires77

engine/render/r_main.cpp

@@ -1710,7 +1710,10 @@ void r_renderer_c::DoScreenshot(image_c* i, const char* ext)
 	// curTimeSt.tm_mon+1, curTimeSt.tm_mday, curTimeSt.tm_year%100,
 	// curTimeSt.tm_hour, curTimeSt.tm_min, curTimeSt.tm_sec, ext);
 
-// Save image
+	// Make folder if it doesn't exist
+	_mkdir(CFG_DATAPATH "Screenshots");
+	
+	// Save image
 	if (i->Save(ssname.c_str())) {
 		sys->con->Print("Couldn't write screenshot!\n");
 	}

engine/system/win/sys_console.cpp

@@ -171,6 +171,9 @@ void sys_console_c::ThreadProc()
 	UnregisterClass(CFG_SCON_TITLE " Class", sys->hinst);
 
 	isRunning = false;
+
+	// Flush windowless messages (Like WM_QUIT)
+	sys->RunMessages();
 }
 
 sys_console_c::~sys_console_c()
@@ -201,6 +204,7 @@ LRESULT __stdcall sys_console_c::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPA
 		}
 	case WM_CLOSE:
 		// Quit
+		conWin->doRun = false;
 		PostQuitMessage(0);
 		return FALSE;
 	}

engine/system/win/sys_main.cpp

@@ -348,7 +348,7 @@ static const byte sys_keyRemap[] = {
 	0,				// 5D		VK_APPS
 	0,				// 5E		-
 	0,				// 5F		VK_SLEEP
-	0,				// 60		VK_NUMPAD0
+	'0',			// 60		VK_NUMPAD0
 	0,				// 61		VK_NUMPAD1
 	0,				// 62		VK_NUMPAD2
 	0,				// 63		VK_NUMPAD3
@@ -359,9 +359,9 @@ static const byte sys_keyRemap[] = {
 	0,				// 68		VK_NUMPAD8
 	0,				// 69		VK_NUMPAD9
 	0,				// 6A		VK_MULTIPLY
-	0,				// 6B		VK_ADD
+	'+',			// 6B		VK_ADD
 	0,				// 6C		VK_SEPARATOR
-	0,				// 6D		VK_SUBTRACT
+	'-',			// 6D		VK_SUBTRACT
 	0,				// 6E		VK_DECIMAL
 	0,				// 6F		VK_DIVIDE
 	KEY_F1,			// 70		VK_F1

ui_console.cpp

@@ -98,7 +98,7 @@ void ui_console_c::Hide()
 
 bool ui_console_c::KeyEvent(int key, int type)
 {
-	if (type == KE_KEYDOWN && key == '`' && sys->IsKeyDown(KEY_CTRL)) {
+	if (type == KE_KEYDOWN && (key == '`' || key == KEY_F1) && sys->IsKeyDown(KEY_CTRL)) {
 		Toggle();
 		return true;
 	}

ui_subscript.cpp

@@ -313,6 +313,10 @@ bool ui_subscript_c::Start()
 	lua_pushlightuserdata(L, this);
 	lua_rawseti(L, LUA_REGISTRYINDEX, 0);
 	lua_pushcfunction(L, traceback);
+
+	lua_pushboolean(L, 1);
+	lua_setfield(L, LUA_REGISTRYINDEX, "LUA_NOENV");
+
 	// Add libraries and APIs
 	lua_gc(L, LUA_GCSTOP, 0);
 	luaL_openlibs(L);