Merge pull request elizagamedev#27 from rkevin-arch/add-force-quit

Add force quit feature
codedwrench · Mar 21, 2021 · 62650b6 · 62650b6
2 parents 7bb1b19 + 24baf2d
commit 62650b6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/binding-mri/binding-mri.cpp b/binding-mri/binding-mri.cpp
@@ -92,6 +92,7 @@ RB_METHOD(mkxpDataDirectory);
 RB_METHOD(mkxpPuts);
 RB_METHOD(mkxpRawKeyStates);
 RB_METHOD(mkxpMouseInWindow);
+RB_METHOD(mkxpAllowForceQuit);
 
 RB_METHOD(mriRgssMain);
 RB_METHOD(mriRgssStop);
@@ -150,6 +151,7 @@ static void mriBindingInit()
 	_rb_define_module_function(mod, "puts", mkxpPuts);
 	_rb_define_module_function(mod, "raw_key_states", mkxpRawKeyStates);
 	_rb_define_module_function(mod, "mouse_in_window", mkxpMouseInWindow);
+	_rb_define_module_function(mod, "allow_force_quit", mkxpAllowForceQuit);
 
 	/* Load global constants */
 	rb_gv_set("MKXP", Qtrue);
@@ -256,6 +258,12 @@ RB_METHOD(mkxpMouseInWindow)
 	return rb_bool_new(EventThread::mouseState.inWindow);
 }
 
+RB_METHOD(mkxpAllowForceQuit) {
+	RB_UNUSED_PARAM;
+	shState->rtData().allowForceQuit.set();
+	return Qnil;
+}
+
 static VALUE rgssMainCb(VALUE block)
 {
 	rb_funcall2(block, rb_intern("call"), 0, 0);

diff --git a/src/eventthread.cpp b/src/eventthread.cpp
@@ -348,6 +348,12 @@ void EventThread::process(RGSSThreadData &rtData)
 				break;
 			}
 
+			if (event.key.keysym.scancode == SDL_SCANCODE_F3 && rtData.allowForceQuit) {
+				// ModShot addition: force quit the game, no prompting or saving
+				terminate = true;
+				break;
+			}
+
 			if (event.key.keysym.scancode == SDL_SCANCODE_F12)
 			{
 				if (!rtData.config.debugMode)

diff --git a/src/eventthread.h b/src/eventthread.h
@@ -251,6 +251,9 @@ struct RGSSThreadData
 	/* True if accepting text input */
 	AtomicFlag acceptingTextInput;
 
+	/* True if allow force quit */
+	AtomicFlag allowForceQuit;
+
 	EventThread *ethread;
 	UnidirMessage<Vec2i> windowSizeMsg;
 	UnidirMessage<BDescVec> bindingUpdateMsg;