simplesquirrel: Store Squirrel thread object handlers in main ssq::VM

SuperTux · Jan 11, 2025 · 6b5506c · 6b5506c
1 parent 8b5bc3c
commit 6b5506c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/external/simplesquirrel b/external/simplesquirrel
diff --git a/src/squirrel/squirrel_environment.cpp b/src/squirrel/squirrel_environment.cpp
@@ -33,9 +33,6 @@ SquirrelEnvironment::SquirrelEnvironment(ssq::VM& vm, const std::string& name) :
   m_scripts(),
   m_scheduler(std::make_unique<SquirrelScheduler>(m_vm))
 {
-  // Garbage collector has to be invoked manually!
-  sq_collectgarbage(m_vm.getHandle());
-
   // Set the root table as delegate.
   m_table.setDelegate(m_vm);
 }
@@ -44,8 +41,6 @@ SquirrelEnvironment::~SquirrelEnvironment()
 {
   m_scripts.clear();
   m_table.reset();
-
-  sq_collectgarbage(m_vm.getHandle());
 }
 
 void

diff --git a/src/squirrel/supertux_api.cpp b/src/squirrel/supertux_api.cpp
@@ -164,7 +164,8 @@ static bool check_cutscene()
 static SQInteger wait(HSQUIRRELVM vm, float seconds, bool forced = false)
 {
   ssq::VM* ssq_vm = ssq::VM::get(vm);
-  if (ssq_vm && !ssq_vm->isThread()) return 0;
+  assert(ssq_vm);
+  if (!ssq_vm->isThread()) return 0;
 
   if (!forced)
   {
@@ -310,10 +311,11 @@ static void load_level(const std::string& filename)
  */
 static void import(HSQUIRRELVM vm, const std::string& filename)
 {
-  ssq::VM ssq_vm(vm);
+  ssq::VM* ssq_vm = ssq::VM::get(vm);
+  assert(ssq_vm);
 
   IFileStream in(filename);
-  ssq_vm.run(ssq_vm.compileSource(in, filename.c_str()));
+  ssq_vm->run(ssq_vm->compileSource(in, filename.c_str()));
 }
 
 /**
+27 −19		include/simplesquirrel/binding.hpp
+9 −8		include/simplesquirrel/vm.hpp
+47 −31		source/vm.cpp