Доработан таймер

Author: AlexandrKozlovskiy

PlainInsteadView.cpp

@@ -27,8 +27,8 @@ extern "C" {
 	extern BOOL IsNeedSaveTadsGame; //Íåîáõîäèìî ñîõðàíåíèå èãðû
 	extern BOOL IsOkSaveLoadTadsGame; //Óñïåøíîñòü ñîõðàíåíèÿ/çàãðóçêè
 	extern char TadsFileName[200];
+	int inv_save_index = -1; //Èíäåêñ â map Ñîõðàíåííîãî ðåçóëüòàòà èíâåíòàðÿ
 }
-
 #define txt text_er + text[debug] + ways_er +(debug?ways:L"") + inv_er + (debug ? inv : L"")
 static BOOL m_auto_say;
 CPlainInsteadView* CPlainInsteadView::m_curView = 0;

PlainInsteadView.h

@@ -110,7 +110,6 @@ void onNewInsteadCommand(char*cmd, char* p,CString cmdForLog = L"",int rc=0);
 	CListBox mListWays;
 	CListBox mListInv;
 	std::map<int, int> pos_id_inv;
-	int inv_save_index=-1; //Èíäåêñ â map Ñîõðàíåííîãî ðåçóëüòàòà èíâåíòàðÿ
 	afx_msg void OnUpdateOutView();
 	afx_msg void OnStnClickedStaticScene();
 	CStatic mStaticScene;

build/tiny2.lua

@@ -92,6 +92,7 @@ end]]
 stead.restart =instead_restart
 stead.menu_toggle =instead_menu
 stead.autosave=instead_autosave
+stead.wait_use=instead_wait_use
 -- Audio
 stead.get_music = function()
 	return game._music, game._music_loop;
@@ -231,6 +232,7 @@ restore_music = stead.restore_music
 is_music = stead.is_music
 function stead.mouse_filter() return 0 end
 	function stead.mouse_pos() return 0,0 end
+function stead.grab_events() return true end
 function stead.screen_size() return 0,0 end
 --Для космический рейнджеров
 unpack = stead.unpack;

tiny_instead/tiny_gui.c

@@ -1,7 +1,7 @@
 #include "externals.h"
 #include "internals.h"
 static int game_grab_events = 0;
-static int game_wait_use = 1;
+int game_wait_use = 1;
 static char* GetClipboardText()
 {
 	if (!IsClipboardFormatAvailable(CF_TEXT) || !OpenClipboard(NULL)) return NULL;
@@ -47,6 +47,7 @@ const char* text = luaL_optstring(L, 1, NULL);
 	return 0;
 	}
 static int luaB_wait_use(lua_State* L) {
+	if (lua_isboolean(L, 1)) game_wait_use = lua_toboolean(L, 1);
 	return 0;
 }
 static int luaB_grab_events(lua_State* L) {

tiny_instead/tiny_timer.c

@@ -6,6 +6,7 @@
 	static UINT_PTR timer_id = 0;
 	static int volatile unsigned instead_timer_nr = 0;
 	extern BOOLEAN isSaving;
+	extern int inv_save_index, game_wait_use;
 	static void CALLBACK instead_fn(HWND window, UINT interval, UINT timer_id, DWORD dword);
 	extern void onNewInsteadCommand(char* cmd, char* p,int rc);
 	extern uint64_t getTicks();
@@ -30,7 +31,7 @@ if (!delay)
 	static void onTimer() {
 instead_timer_nr = 0;
 		instead_lock();
-		if (instead_busy() || !timer_id ||isSaving) {
+		if (instead_busy() || !timer_id ||isSaving || (game_wait_use &&inv_save_index>-1)) {
 			instead_unlock();
 			return;
 		}