@@ -164,15 +164,14 @@ static bool check_cutscene()
164
164
static SQInteger wait (HSQUIRRELVM vm, float seconds, bool forced = false )
165
165
{
166
166
ssq::VM* ssq_vm = ssq::VM::get (vm);
167
- assert (ssq_vm);
168
- if (ssq_vm && !ssq_vm->isThread ()) return 0 ;
167
+ if (!ssq_vm || !ssq_vm->isThread ()) return 0 ;
169
168
170
169
if (!forced)
171
170
{
172
171
auto session = GameSession::current ();
173
172
if (session && session->get_current_level ().m_skip_cutscene )
174
173
{
175
- if (ssq_vm && ssq_vm ->getForeignPtr ())
174
+ if (ssq_vm->getForeignPtr ())
176
175
{
177
176
auto squirrelenv = ssq_vm->getForeignPtr <SquirrelEnvironment>();
178
177
// Wait anyways, to prevent scripts like `while (true) {wait(0.1); ...}`.
@@ -183,7 +182,7 @@ static SQInteger wait(HSQUIRRELVM vm, float seconds, bool forced = false)
183
182
}
184
183
if (session && session->get_current_level ().m_is_in_cutscene )
185
184
{
186
- if (ssq_vm && ssq_vm ->getForeignPtr ())
185
+ if (ssq_vm->getForeignPtr ())
187
186
{
188
187
auto squirrelenv = ssq_vm->getForeignPtr <SquirrelEnvironment>();
189
188
// Wait anyways, to prevent scripts like `while (true) {wait(0.1); ...}` from freezing the game.
@@ -193,7 +192,7 @@ static SQInteger wait(HSQUIRRELVM vm, float seconds, bool forced = false)
193
192
return squirrelvm->skippable_wait_for_seconds (vm, seconds);
194
193
}
195
194
}
196
- if (ssq_vm && ssq_vm ->getForeignPtr ())
195
+ if (ssq_vm->getForeignPtr ())
197
196
{
198
197
auto squirrelenv = ssq_vm->getForeignPtr <SquirrelEnvironment>();
199
198
return squirrelenv->wait_for_seconds (vm, seconds);
@@ -312,7 +311,7 @@ static void load_level(const std::string& filename)
312
311
static void import (HSQUIRRELVM vm, const std::string& filename)
313
312
{
314
313
ssq::VM* ssq_vm = ssq::VM::get (vm);
315
- assert ( ssq_vm);
314
+ if (! ssq_vm) return ;
316
315
317
316
IFileStream in (filename);
318
317
ssq_vm->run (ssq_vm->compileSource (in, filename.c_str ()));
0 commit comments