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

Fix collision bug in dark world and edit readme.md (#134)

This commit is contained in:
Isaac0-dev 2022-06-25 17:59:48 +10:00 committed by GitHub
parent a9bbbacd71
commit a344a23bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -13,7 +13,7 @@ Run `./extract_assets.py --clean && make clean` or `make distclean` to remove RO
## Goal (accomplished) ## Goal (accomplished)
Create a mod for the PC port where multiple people can play online together. Create a mod for the PC port where multiple people can play online together.
Unlike previous online attempts, this one synchronized enemies and events. This allows player to be interacting with the same world at the same time. Unlike previous online attempts, this one synchronized enemies and events. This allows players to be interacting with the same world at the same time.
## Discord ## Discord
[https://discord.gg/TJVKHS4](https://discord.gg/TJVKHS4) [https://discord.gg/TJVKHS4](https://discord.gg/TJVKHS4)

4
src/game/mario.c
View File

@ -624,8 +624,10 @@ f32 vec3f_find_ceil(Vec3f pos, f32 height, struct Surface **ceil) {
f32 vec3f_mario_ceil(Vec3f pos, f32 height, struct Surface **ceil) { f32 vec3f_mario_ceil(Vec3f pos, f32 height, struct Surface **ceil) {
if (gServerSettings.fixCollisionBugs) { if (gServerSettings.fixCollisionBugs) {
height = MAX(height + 80.0f, pos[1] - 2); height = MAX(height + 80.0f, pos[1] - 2);
}
return find_ceil(pos[0], height, pos[2], ceil); return find_ceil(pos[0], height, pos[2], ceil);
} else {
return vec3f_find_ceil(pos, height, ceil);
}
} }
/** /**

2
src/pc/network/discord/discord.c
View File

@ -28,7 +28,7 @@ static void discord_sdk_log_callback(UNUSED void* hook_data, enum EDiscordLogLev
} }
void discord_fatal_message(int rc) { void discord_fatal_message(int rc) {
return; // TODO FIGURE OUT WHY DISCORD DOES THIS return; // Discord usually does this because of loss of connection to Discord
char errorMessage[132] = { 0 }; char errorMessage[132] = { 0 };
snprintf(errorMessage, 132, "Discord threw an error.\nTo fix: \n1. Close the game.\n2. Restart Discord.\n3. Start the game.\nRC: %d", rc); snprintf(errorMessage, 132, "Discord threw an error.\nTo fix: \n1. Close the game.\n2. Restart Discord.\n3. Start the game.\nRC: %d", rc);
djui_popup_create(errorMessage, 6); djui_popup_create(errorMessage, 6);