summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-12 23:55:52 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-12 23:55:52 +0200
commit7c2b9478d52e5122eff2e11298f31bfc1b896f94 (patch)
tree53ad6828eb1366a5dd00d9977eec330bd3d7b52f /src/control
parentMerge remote-tracking branch 'origin/master' into miami (diff)
parentMerge pull request #537 from ShFil119/linux_warns (diff)
downloadre3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.gz
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.bz2
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.lz
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.xz
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.zst
re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/CarAI.cpp1
-rw-r--r--src/control/CarCtrl.cpp1
-rw-r--r--src/control/Garages.cpp3
-rw-r--r--src/control/Pickups.cpp2
-rw-r--r--src/control/SceneEdit.cpp4
-rw-r--r--src/control/Script.cpp2
6 files changed, 11 insertions, 2 deletions
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp
index c233178f..0f80954b 100644
--- a/src/control/CarAI.cpp
+++ b/src/control/CarAI.cpp
@@ -461,6 +461,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
}
}
break;
+ default: break;
}
}
if (pVehicle->pDriver && pVehicle->pDriver->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS){
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 833bd192..963ef693 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -2671,6 +2671,7 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
SteerAICarWithPhysicsHeadingForTarget(pVehicle, nil, pVehicle->AutoPilot.m_vecDestinationCoors.x,
pVehicle->AutoPilot.m_vecDestinationCoors.y, pSwerve, pAccel, pBrake, pHandbrake);
return;
+ default: break;
}
}
pCurrentLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo];
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index b72931c6..82003561 100644
--- a/src/control/Garages.cpp
+++ b/src/control/Garages.cpp
@@ -533,6 +533,7 @@ void CGarage::Update()
case GARAGE_BOMBSHOP1: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB1_SET, 1); break;
case GARAGE_BOMBSHOP2: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB2_SET, 1); break;
case GARAGE_BOMBSHOP3: DMAudio.PlayFrontEndSound(SOUND_GARAGE_BOMB3_SET, 1); break;
+ default: break;
}
m_eGarageState = GS_OPENING;
if (!CGarages::BombsAreFree)
@@ -577,6 +578,7 @@ void CGarage::Update()
case GARAGE_BOMBSHOP3:
CHud::SetHelpMessage(TheText.Get("GA_8"), false); // Use the detonator to activate the bomb.
break;
+ default: break;
}
CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_GARAGE);
FindPlayerPed()->m_pWanted->m_bIgnoredByCops = false;
@@ -2064,6 +2066,7 @@ bool CGarages::IsPointWithinHideOutGarage(Const CVector& point)
case GARAGE_HIDEOUT_THREE:
if (aGarages[i].IsPointInsideGarage(point))
return true;
+ default: break;
}
}
return false;
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 59b8b5c2..330b5788 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -356,6 +356,7 @@ CPickup::Update(CPlayerPed *player, CVehicle *vehicle, int playerId)
return true;
}
break;
+ default: break;
}
}
if (!m_bRemoved && (m_eType == PICKUP_ONCE_TIMEOUT || m_eType == PICKUP_MONEY) && CTimer::GetTimeInMilliseconds() > m_nTimer)
@@ -576,6 +577,7 @@ CPickups::ModelForWeapon(eWeaponType weaponType)
case WEAPONTYPE_FLAMETHROWER: return MI_FLAMETHROWER;
case WEAPONTYPE_MOLOTOV: return MI_MOLOTOV;
case WEAPONTYPE_GRENADE: return MI_GRENADE;
+ default: break;
}
return 0;
}
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 1b6292b8..f7dcaa3c 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -303,7 +303,7 @@ void CSceneEdit::Draw(void)
nCommandDrawn -= (MOVIE_TOTAL_COMMANDS - 1);
if (nCommandDrawn <= MOVIE_DO_NOTHING)
nCommandDrawn += (MOVIE_TOTAL_COMMANDS - 1);
- sprintf(str, pCommandStrings[nCommandDrawn]);
+ sprintf(str, "%s", pCommandStrings[nCommandDrawn]);
AsciiToUnicode(str, wstr);
CFont::SetColor(CRGBA(0, 0, 0, 0));
CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(COMMAND_NAME_X_RIGHT - SHADOW_OFFSET), SCREEN_SCALE_Y(COMMAND_NAME_Y + SHADOW_OFFSET + i * COMMAND_NAME_HEIGHT), wstr);
@@ -1095,4 +1095,4 @@ bool CSceneEdit::SelectWeapon(void)
return false;
}
return false;
-} \ No newline at end of file
+}
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index ccfc010e..50dc6b7b 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -11777,6 +11777,7 @@ INITSAVEBUF
case ENTITY_TYPE_DUMMY:
type = 4;
handle = CPools::GetDummyPool()->GetJustIndex((CDummy*)pEntity) + 1;
+ default: break;
}
}
WriteSaveBuf(buf, type);
@@ -11934,6 +11935,7 @@ void CTheScripts::ClearSpaceForMissionEntity(const CVector& pos, CEntity* pEntit
printf("Deleted a ped where a mission entity should be\n");
break;
}
+ default: break;
}
}
}