etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix DirectX builds

Browse source
This commit is contained in:
MysterD 2020-09-15 21:48:14 -07:00
parent 128b3f2b33
commit a0d5deceff
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 CXX := emcc
endif endif
LD := $(CC) LD := $(CXX)
#ifeq ($(DISCORDRPC),1) #ifeq ($(DISCORDRPC),1)
# LD := $(CXX) # 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); void* behavior = (void*)get_behavior_from_id(data.behaviorId);
struct Object* o = spawn_object(parentObj, data.model, behavior); struct Object* o = spawn_object(parentObj, data.model, behavior);
memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80); memcpy(o->rawData.asU32, data.rawData, sizeof(u32) * 80);