fix line conflicts

Makefile

@@ -381,7 +381,6 @@ endif
 
 ifeq ($(HEADLESS),1)
   $(info Compiling headless)
-  
   RENDER_API := DUMMY
   WINDOW_API := DUMMY
   AUDIO_API := DUMMY

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).
+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).

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;
         }
     }

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");
 }

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;
 }
 

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;

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;
 }
 

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;

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);
     }
-}
+}

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);

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();
 }
 

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);