Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent spawning objects from lua before the area is synchronized

This commit is contained in:
MysterD 2022-03-11 01:31:12 -08:00
parent 99c4498236
commit 1c7451fcfc
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/area.c
View File

@ -146,7 +146,7 @@ void print_intro_text(void) {
u32 get_mario_spawn_type(struct Object *o) { u32 get_mario_spawn_type(struct Object *o) {
if (o == NULL) { return 0; } if (o == NULL) { return 0; }
const BehaviorScript *behavior = virtual_to_segmented(0x13, o->behavior); const BehaviorScript *behavior = virtual_to_segmented(0x13, o->behavior);
for (s32 i = 0; i < 20; i++) { for (s32 i = 0; i < 20; i++) {

3
src/pc/lua/utils/smlua_obj_utils.c
View File

@ -9,6 +9,9 @@
#include "pc/debuglog.h" #include "pc/debuglog.h"
static struct Object* spawn_object_internal(enum BehaviorId behaviorId, enum ModelExtendedId modelId, f32 x, f32 y, f32 z, LuaFunction objSetupFunction, bool doSync) { static struct Object* spawn_object_internal(enum BehaviorId behaviorId, enum ModelExtendedId modelId, f32 x, f32 y, f32 z, LuaFunction objSetupFunction, bool doSync) {
// prevent spawning objects before area is synchronized
if (gNetworkPlayerLocal == NULL || !gNetworkPlayerLocal->currAreaSyncValid) { return NULL; }
const BehaviorScript* behavior = get_behavior_from_id(behaviorId); const BehaviorScript* behavior = get_behavior_from_id(behaviorId);
if (behavior == NULL) { if (behavior == NULL) {
LOG_ERROR("failed to find behavior %u", behaviorId); LOG_ERROR("failed to find behavior %u", behaviorId);