From 02dd261ca91467688a6e0ed1fbffa50e99300338 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 27 Jun 2025 16:15:08 -0700 Subject: [PATCH] Fix isle/master merge --- LEGO1/lego/legoomni/src/race/legoracespecial.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp index 6fa64058..7fe58c71 100644 --- a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp @@ -401,13 +401,8 @@ void LegoJetskiRaceActor::Animate(float p_time) { if (m_animState == 0) { const LegoChar* raceState = VariableTable()->GetVariable(g_raceState); -<<<<<<< HEAD if (!SDL_strcasecmp(raceState, g_racing)) { - m_unk0x0c = 1; -======= - if (!stricmp(raceState, g_racing)) { m_animState = 1; ->>>>>>> isle/master m_lastTime = p_time - 1.0f; m_unk0x1c = p_time; }