archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-28 18:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux warnings

Browse Source
This commit is contained in:
Filip Gawin
2020-05-12 01:24:57 +02:00
parent c40fcdf39a
commit c2ac6b3759
52 changed files with 165 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/control/CarAI.cpp
View File

@ -431,6 +431,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle)
}
}
break;
default: break;
}
}
if (pVehicle->pDriver && pVehicle->pDriver->m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS){

1
src/control/CarCtrl.cpp
View File

@ -2307,6 +2307,7 @@ void CCarCtrl::SteerAICarWithPhysicsFollowPath(CVehicle* pVehicle, float* pSwerv
*pBrake = 0.0f;
*pHandbrake = false;
return;
default: break;
}
}
pCurrentLink = &ThePaths.m_carPathLinks[pVehicle->AutoPilot.m_nCurrentPathNodeInfo];

7
src/control/Garages.cpp
View File

@ -517,6 +517,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)
@ -561,6 +562,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;
@ -1065,6 +1067,7 @@ void CGarage::Update()
case GARAGE_HIDEOUT_ONE: StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse1, MAX_STORED_CARS_IN_INDUSTRIAL); break;
case GARAGE_HIDEOUT_TWO: StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse2, MAX_STORED_CARS_IN_COMMERCIAL); break;
case GARAGE_HIDEOUT_THREE: StoreAndRemoveCarsForThisHideout(CGarages::aCarsInSafeHouse3, MAX_STORED_CARS_IN_SUBURBAN); break;
default: break;
}
}
UpdateDoorsHeight();
@ -1093,6 +1096,7 @@ void CGarage::Update()
case GARAGE_HIDEOUT_ONE: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse1); break;
case GARAGE_HIDEOUT_TWO: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse2); break;
case GARAGE_HIDEOUT_THREE: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse3); break;
default: break;
}
if (bCreatedAllCars)
m_eGarageState = GS_OPENING;
@ -2151,6 +2155,7 @@ int32 CGarages::CountCarsInHideoutGarage(eGarageType type)
case GARAGE_HIDEOUT_THREE:
total += (aCarsInSafeHouse3[i].HasCar());
break;
default: break;
}
}
return total;
@ -2165,6 +2170,7 @@ int32 CGarages::FindMaxNumStoredCarsForGarage(eGarageType type)
return LIMIT_CARS_IN_COMMERCIAL;
case GARAGE_HIDEOUT_THREE:
return LIMIT_CARS_IN_SUBURBAN;
default: break;
}
return 0;
}
@ -2180,6 +2186,7 @@ bool CGarages::IsPointWithinHideOutGarage(Const CVector& point)
point.y > aGarages[i].m_fY1 && point.y < aGarages[i].m_fY2 &&
point.z > aGarages[i].m_fZ1 && point.z < aGarages[i].m_fZ2)
return true;
default: break;
}
}
return false;

2
src/control/Pickups.cpp
View File

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

4
src/control/SceneEdit.cpp
View File

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

2
src/control/Script.cpp
View File

@ -11305,6 +11305,7 @@ INITSAVEBUF
case ENTITY_TYPE_DUMMY:
type = 4;
handle = CPools::GetDummyPool()->GetJustIndex((CDummy*)pEntity) + 1;
default: break;
}
}
WriteSaveBuf(buf, type);
@ -11462,6 +11463,7 @@ void CTheScripts::ClearSpaceForMissionEntity(const CVector& pos, CEntity* pEntit
printf("Deleted a ped where a mission entity should be\n");
break;
}
default: break;
}
}
}