diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/control/Garages.cpp | 8 | ||||
| -rw-r--r-- | src/control/Script.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 876840c4..53cebeea 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -1722,10 +1722,10 @@ void CGarage::FindDoorsEntities() { m_pDoor1 = nil; m_pDoor2 = nil; - int xstart = Max(0, CWorld::GetSectorIndexX(GetGarageCenterX())); - int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(m_fSupX)); - int ystart = Max(0, CWorld::GetSectorIndexY(GetGarageCenterY())); - int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(m_fSupY)); + int xstart = Max(0, CWorld::GetSectorIndexX(GetGarageCenterX() - 100.0f)); + int xend = Min(NUMSECTORS_X - 1, CWorld::GetSectorIndexX(GetGarageCenterX() + 100.0f)); + int ystart = Max(0, CWorld::GetSectorIndexY(GetGarageCenterY() - 100.0f)); + int yend = Min(NUMSECTORS_Y - 1, CWorld::GetSectorIndexY(GetGarageCenterY() + 100.0f)); assert(xstart <= xend); assert(ystart <= yend); diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 5ff5a383..9d5e347b 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -4767,10 +4767,10 @@ void CRunningScript::Save(uint8*& buf) #endif for (int i = 0; i < NUM_LOCAL_VARS + NUM_TIMERS; i++) WriteSaveBuf<int32>(buf, m_anLocalVariables[i]); + WriteSaveBuf<bool>(buf, m_bIsActive); WriteSaveBuf<bool>(buf, m_bCondResult); WriteSaveBuf<bool>(buf, m_bIsMissionScript); WriteSaveBuf<bool>(buf, m_bSkipWakeTime); - SkipSaveBuf(buf, 1); WriteSaveBuf<uint32>(buf, m_nWakeTime); WriteSaveBuf<uint16>(buf, m_nAndOrState); WriteSaveBuf<bool>(buf, m_bNotFlag); @@ -4802,10 +4802,10 @@ void CRunningScript::Load(uint8*& buf) #endif for (int i = 0; i < NUM_LOCAL_VARS + NUM_TIMERS; i++) m_anLocalVariables[i] = ReadSaveBuf<int32>(buf); + m_bIsActive = ReadSaveBuf<bool>(buf); m_bCondResult = ReadSaveBuf<bool>(buf); m_bIsMissionScript = ReadSaveBuf<bool>(buf); m_bSkipWakeTime = ReadSaveBuf<bool>(buf); - SkipSaveBuf(buf, 1); m_nWakeTime = ReadSaveBuf<uint32>(buf); m_nAndOrState = ReadSaveBuf<uint16>(buf); m_bNotFlag = ReadSaveBuf<bool>(buf); |