Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DirectX builds

This commit is contained in:
MysterD 2020-09-15 21:48:14 -07:00
parent d44ae27393
commit 663da861cb
3 changed files with 4809 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -460,7 +460,7 @@ else
CXX := emcc
endif
LD := $(CC)
LD := $(CXX)
#ifeq ($(DISCORDRPC),1)
# LD := $(CXX)

4803
compilelog.txt Normal file
View File

File diff suppressed because one or more lines are too long

5
src/pc/network/packets/packet_spawn_objects.c
View File

@ -117,6 +117,11 @@ void network_receive_spawn_objects(struct Packet* p) {
}
}
if (parentObj == NULL) {
printf("ERROR: failed to attach to mario!\n");
return;
}
void* behavior = (void*)get_behavior_from_id(data.behaviorId);
struct Object* o = spawn_object(parentObj, data.model, behavior);
memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80);