From ae089525a13dc79b303124e51298e19950a043a5 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 19 Dec 2024 21:20:24 -0600 Subject: [PATCH] fix line conflicts --- Makefile | 1 - README.md | 2 +- src/game/mario.c | 2 +- src/pc/discord/discord_activity.c | 2 +- src/pc/lua/utils/smlua_audio_utils.c | 6 +++--- src/pc/network/coopnet/coopnet.c | 2 +- src/pc/network/network.c | 5 ++--- src/pc/network/network_player.c | 2 -- src/pc/network/packets/packet_chat.c | 2 +- src/pc/network/packets/packet_join.c | 5 ++--- src/pc/network/packets/packet_mod_list.c | 2 +- src/pc/pc_main.c | 4 ++-- 12 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 72e2d305f..996c12893 100644 --- a/Makefile +++ b/Makefile @@ -381,7 +381,6 @@ endif ifeq ($(HEADLESS),1) $(info Compiling headless) - RENDER_API := DUMMY WINDOW_API := DUMMY AUDIO_API := DUMMY diff --git a/README.md b/README.md index 24a521c11..36ecd0822 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ Interestingly enough though, the goal of the project has slowly evolved over tim sm64coopdx is moddable via Lua, similar to Roblox and Garry's Mod's Lua APIs. To get started, click [here](docs/lua/lua.md) to see the Lua documentation. ## Wiki -The wiki is made using GitHub's wiki feature, you can go to the wiki tab or click [here](https://github.com/coop-deluxe/sm64coopdx/wiki). \ No newline at end of file +The wiki is made using GitHub's wiki feature, you can go to the wiki tab or click [here](https://github.com/coop-deluxe/sm64coopdx/wiki). diff --git a/src/game/mario.c b/src/game/mario.c index 6d5762c33..06049177f 100644 --- a/src/game/mario.c +++ b/src/game/mario.c @@ -597,7 +597,7 @@ u32 mario_get_terrain_sound_addend(struct MarioState *m) { floorSoundType = 5; break; } - + ret = sTerrainSounds[terrainType][floorSoundType] << 16; } } diff --git a/src/pc/discord/discord_activity.c b/src/pc/discord/discord_activity.c index defe5bdcc..304044471 100644 --- a/src/pc/discord/discord_activity.c +++ b/src/pc/discord/discord_activity.c @@ -135,7 +135,7 @@ void discord_activity_update(void) { LOG_INFO("no update_activity"); return; } - + app.activities->update_activity(app.activities, &sCurActivity, NULL, on_activity_update_callback); LOG_INFO("set activity"); } diff --git a/src/pc/lua/utils/smlua_audio_utils.c b/src/pc/lua/utils/smlua_audio_utils.c index d818ea1ce..4cde88afc 100644 --- a/src/pc/lua/utils/smlua_audio_utils.c +++ b/src/pc/lua/utils/smlua_audio_utils.c @@ -168,8 +168,8 @@ static struct DynamicPool *sModAudioPool; static void smlua_audio_custom_init(void) { sModAudioPool = dynamic_pool_init(); - - ma_result result = ma_engine_init(NULL, &sModAudioEngine); + + ma_result result = ma_engine_init(NULL, &sModAudioEngine); if (result != MA_SUCCESS) { LOG_ERROR("failed to init Miniaudio: %d", result); } @@ -311,11 +311,11 @@ struct ModAudio* audio_load_internal(const char* filename, bool isStream) { LOG_ERROR("failed to load audio file '%s': %d", filename, result); return NULL; } + audio->buffer = buffer; audio->bufferSize = size; audio->isStream = isStream; audio->loaded = true; - return audio; } diff --git a/src/pc/network/coopnet/coopnet.c b/src/pc/network/coopnet/coopnet.c index 9a9087e52..928dba054 100644 --- a/src/pc/network/coopnet/coopnet.c +++ b/src/pc/network/coopnet/coopnet.c @@ -278,7 +278,7 @@ static CoopNetRc coopnet_initialize(void) { gCoopNetCallbacks.OnError = coopnet_on_error; gCoopNetCallbacks.OnPeerDisconnected = coopnet_on_peer_disconnected; gCoopNetCallbacks.OnLoadBalance = coopnet_on_load_balance; - + if (coopnet_is_connected()) { return COOPNET_OK; } char* endptr = NULL; diff --git a/src/pc/network/network.c b/src/pc/network/network.c index a3b7acb97..beed3ce88 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -164,9 +164,8 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) { smlua_init(); dynos_behavior_hook_all_custom_behaviors(); - + network_player_connected(NPT_LOCAL, 0, configPlayerModel, &configPlayerPalette, configPlayerName, get_local_discord_id()); - extern u8* gOverrideEeprom; gOverrideEeprom = NULL; @@ -187,7 +186,7 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) { #endif LOG_INFO("initialized"); - + return true; } diff --git a/src/pc/network/network_player.c b/src/pc/network/network_player.c index 74c3f8d88..e06cfd780 100644 --- a/src/pc/network/network_player.c +++ b/src/pc/network/network_player.c @@ -250,7 +250,6 @@ u8 network_player_connected(enum NetworkPlayerType type, u8 globalIndex, u8 mode } else { assert(false); } - struct NetworkPlayer *np = &gNetworkPlayers[localIndex]; // ensure that a name is given @@ -368,7 +367,6 @@ u8 network_player_disconnected(u8 globalIndex) { struct NetworkPlayer* np = &gNetworkPlayers[i]; if (!np->connected) { continue; } if (np->globalIndex != globalIndex) { continue; } - if (gNetworkType == NT_SERVER) { network_send_leaving(np->globalIndex); } np->connected = false; np->currCourseNum = -1; diff --git a/src/pc/network/packets/packet_chat.c b/src/pc/network/packets/packet_chat.c index 232db8462..fc6e97423 100644 --- a/src/pc/network/packets/packet_chat.c +++ b/src/pc/network/packets/packet_chat.c @@ -106,4 +106,4 @@ void network_receive_chat(struct Packet* p) { } else { LOG_INFO("rx chat: %s", remoteMessage); } -} \ No newline at end of file +} diff --git a/src/pc/network/packets/packet_join.c b/src/pc/network/packets/packet_join.c index 5cb04c1f7..1f7c41032 100644 --- a/src/pc/network/packets/packet_join.c +++ b/src/pc/network/packets/packet_join.c @@ -81,7 +81,6 @@ void network_send_join(struct Packet* joinRequestPacket) { // figure out id u8 globalIndex = joinRequestPacket->localIndex; u8 connectedCount = 1; - if (globalIndex == UNKNOWN_LOCAL_INDEX) { for (u32 i = 1; i < MAX_PLAYERS; i++) { if (!gNetworkPlayers[i].connected) { @@ -97,10 +96,10 @@ void network_send_join(struct Packet* joinRequestPacket) { } } LOG_INFO("chose globalIndex: %d", globalIndex); - + // do connection event network_player_connected(NPT_CLIENT, globalIndex, sJoinRequestPlayerModel, &sJoinRequestPlayerPalette, sJoinRequestPlayerName, sJoinRequestDiscordId); - + fs_file_t* fp = fs_open(SAVE_FILENAME); if (fp != NULL) { fs_read(fp, eeprom, 512); diff --git a/src/pc/network/packets/packet_mod_list.c b/src/pc/network/packets/packet_mod_list.c index 637074594..2a4a7baf8 100644 --- a/src/pc/network/packets/packet_mod_list.c +++ b/src/pc/network/packets/packet_mod_list.c @@ -34,7 +34,7 @@ void network_receive_mod_list_request(UNUSED struct Packet* p) { return; } LOG_INFO("received mod list request"); - + network_send_mod_list(); } diff --git a/src/pc/pc_main.c b/src/pc/pc_main.c index 72251b170..b0818773f 100644 --- a/src/pc/pc_main.c +++ b/src/pc/pc_main.c @@ -299,7 +299,7 @@ void produce_one_frame(void) { CTX_EXTENT(CTX_INTERP, patch_interpolations_before); CTX_EXTENT(CTX_GAME_LOOP, game_loop_one_iteration); - + CTX_EXTENT(CTX_SMLUA, smlua_update); // If we aren't threaded @@ -518,7 +518,7 @@ int main(int argc, char *argv[]) { } // main loop - while (true) { + while (true) { debug_context_reset(); CTX_BEGIN(CTX_TOTAL); WAPI.main_loop(produce_one_frame);