isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 18:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix isle/master merge

Browse Source
This commit is contained in:
Christian Semmler 2025-06-27 16:15:08 -07:00
parent c0e41a8ef6
commit 02dd261ca9
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LEGO1/lego/legoomni/src/race/legoracespecial.cpp
View File

@ -401,13 +401,8 @@ void LegoJetskiRaceActor::Animate(float p_time)
{ {
if (m_animState == 0) { if (m_animState == 0) {
const LegoChar* raceState = VariableTable()->GetVariable(g_raceState); const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
<<<<<<< HEAD
if (!SDL_strcasecmp(raceState, g_racing)) { if (!SDL_strcasecmp(raceState, g_racing)) {
m_unk0x0c = 1;
=======
if (!stricmp(raceState, g_racing)) {
m_animState = 1; m_animState = 1;
>>>>>>> isle/master
m_lastTime = p_time - 1.0f; m_lastTime = p_time - 1.0f;
m_unk0x1c = p_time; m_unk0x1c = p_time;
} }