mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity

Fix #3598: Validate vehicle track movement (#3612)

Browse Source
This commit is contained in:
Yaroslav Tretyakov
2016-05-15 10:20:46 -06:00
committed by Ted John
parent 2fadc8d2be
commit a3469cf073
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/track_data.c
View File

@@ -30160,7 +30160,7 @@ const rct_vehicle_info_list *TrackVehicleInfoList_8BAD28[] = {
};
// rct2: 0x008B8F30
const rct_vehicle_info_list **gTrackVehicleInfo[] = {
const rct_vehicle_info_list **gTrackVehicleInfo[17] = {
TrackVehicleInfoList_8B8F98,
TrackVehicleInfoList_8BBAB8,
TrackVehicleInfoList_8BC588,

2
src/ride/track_data.h
View File

@@ -57,4 +57,4 @@ typedef struct {
const rct_vehicle_info info[];
} rct_vehicle_info_list;
extern const rct_vehicle_info_list **gTrackVehicleInfo[];
extern const rct_vehicle_info_list **gTrackVehicleInfo[17];

41
src/ride/vehicle.c
View File

@@ -150,13 +150,54 @@ const uint8 _soundParams[SOUND_MAXID][2] = {
{ 0, 0 } // SOUND_62
};
bool vehicle_move_info_valid(int cd, int typeAndDirection, int offset)
{
if (cd >= countof(gTrackVehicleInfo)) {
return false;
}
int size = 0;
switch (cd) {
case 0: size = 1024; break;
case 1: size = 692; break;
case 2: size = 404; break;
case 3: size = 404; break;
case 4: size = 404; break;
case 5: size = 208; break;
case 6: size = 208; break;
case 7: size = 208; break;
case 8: size = 208; break;
case 9: size = 824; break;
case 10: size = 824; break;
case 11: size = 824; break;
case 12: size = 824; break;
case 13: size = 824; break;
case 14: size = 824; break;
case 15: size = 868; break;
case 16: size = 868; break;
}
if (typeAndDirection >= size) {
return false;
}
if (offset >= gTrackVehicleInfo[cd][typeAndDirection]->size) {
return false;
}
return true;
}
const rct_vehicle_info *vehicle_get_move_info(int cd, int typeAndDirection, int offset)
{
if (!vehicle_move_info_valid(cd, typeAndDirection, offset)) {
static const rct_vehicle_info zero = { 0 };
return &zero;
}
return &gTrackVehicleInfo[cd][typeAndDirection]->info[offset];
}
uint16 vehicle_get_move_info_size(int cd, int typeAndDirection)
{
if (!vehicle_move_info_valid(cd, typeAndDirection, 0)) {
return 0;
}
return gTrackVehicleInfo[cd][typeAndDirection]->size;
}