mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Draw on-ride photo

This commit is contained in:
Marijn van der Werf 2016-05-19 22:21:16 +02:00
parent 008f537a96
commit 385b9cfcda
2 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ride/track_paint.h
View File

@ -61,6 +61,19 @@ enum {
SPR_STATION_PIER_EDGE_NE_FENCED = 22409,
SPR_STATION_PIER_FENCE_SE = 22410,
SPR_STATION_PIER_FENCE_SW = 22411,
SPR_ON_RIDE_PHOTO_CAMERA_N = 25615,
SPR_ON_RIDE_PHOTO_CAMERA_E = 25616,
SPR_ON_RIDE_PHOTO_CAMERA_S = 25617,
SPR_ON_RIDE_PHOTO_CAMERA_W = 25618,
SPR_ON_RIDE_PHOTO_CAMERA_FLASH_N = 25619,
SPR_ON_RIDE_PHOTO_CAMERA_FLASH_E = 25620,
SPR_ON_RIDE_PHOTO_CAMERA_FLASH_S = 25621,
SPR_ON_RIDE_PHOTO_CAMERA_FLASH_W = 25622,
SPR_ON_RIDE_PHOTO_SIGN_SW_NE = 25623,
SPR_ON_RIDE_PHOTO_SIGN_NW_SE = 25624,
SPR_ON_RIDE_PHOTO_SIGN_NE_SW = 25625,
SPR_ON_RIDE_PHOTO_SIGN_SE_NW = 25626,
};
extern const uint32 floorSpritesCork[];

58
src/ride/water/river_rapids.c
View File

@ -24,6 +24,7 @@
#include "../track_paint.h"
#include "../track.h"
#include "../../paint/supports.h"
#include "../../world/map.h"
// 0x0099279E:
static const vehicle_boundbox _riverRapidsBoundbox[] = {
@ -453,7 +454,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(uint8 direction, int heigh
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_force_set_general_support_height(height + 48, 0x20);
paint_util_set_general_support_height(height + 48, 0x20);
}
/** rct2: 0x00757660 */
@ -683,10 +684,61 @@ static void paint_river_rapids_track_rapids(uint8 rideIndex, uint8 trackSequence
paint_util_set_general_support_height(height + 32, 0x20);
}
/** rct2: 0x */
/** rct2: 0x00757740 */
static void paint_river_rapids_track_on_ride_photo(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)
{
paint_river_rapids_track_flat(rideIndex, trackSequence, direction, height, mapElement);
uint32 imageId;
const bool takingPhoto = (bool) (mapElement->properties.track.sequence & 0xF0);
switch (direction) {
case 0:
imageId = SPR_ON_RIDE_PHOTO_SIGN_SW_NE | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 26, 0, 1, 1, 19, height + 13, get_current_rotation());
imageId = SPR_ON_RIDE_PHOTO_SIGN_SW_NE | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 26, 31, 1, 1, 19, height + 13, get_current_rotation());
imageId = (takingPhoto ? SPR_ON_RIDE_PHOTO_CAMERA_FLASH_S : SPR_ON_RIDE_PHOTO_CAMERA_S) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 6, 0, 1, 1, 19, height + 13, get_current_rotation());
break;
case 1:
imageId = SPR_ON_RIDE_PHOTO_SIGN_NW_SE | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 0, 6, 1, 1, 19, height + 13, get_current_rotation());
imageId = SPR_ON_RIDE_PHOTO_SIGN_NW_SE | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 31, 6, 1, 1, 19, height + 13, get_current_rotation());
imageId = (takingPhoto ? SPR_ON_RIDE_PHOTO_CAMERA_FLASH_W : SPR_ON_RIDE_PHOTO_CAMERA_W) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 0, 26, 1, 1, 19, height + 13, get_current_rotation());
break;
case 2:
imageId = SPR_ON_RIDE_PHOTO_SIGN_NE_SW | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 6, 0, 1, 1, 19, height + 13, get_current_rotation());
imageId = SPR_ON_RIDE_PHOTO_SIGN_NE_SW | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 6, 31, 1, 1, 19, height + 13, get_current_rotation());
imageId = (takingPhoto ? SPR_ON_RIDE_PHOTO_CAMERA_FLASH_N : SPR_ON_RIDE_PHOTO_CAMERA_N) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 26, 31, 1, 1, 19, height + 13, get_current_rotation());
break;
case 3:
imageId = SPR_ON_RIDE_PHOTO_SIGN_SE_NW | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 0, 26, 1, 1, 19, height + 13, get_current_rotation());
imageId = SPR_ON_RIDE_PHOTO_SIGN_SE_NW | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 31, 26, 1, 1, 19, height + 13, get_current_rotation());
imageId = (takingPhoto ? SPR_ON_RIDE_PHOTO_CAMERA_FLASH_E : SPR_ON_RIDE_PHOTO_CAMERA_E) | RCT2_GLOBAL(0x00F441A0, uint32);
sub_98196C(imageId, 31, 6, 1, 1, 19, height + 13, get_current_rotation());
break;
}
paint_util_set_general_support_height(height + 48, 0x20);
}
/** rct2: 0x */
@ -725,7 +777,7 @@ static void paint_river_rapids_track_whirlpool(uint8 rideIndex, uint8 trackSeque
}
paint_util_set_segment_support_height(SEGMENTS_ALL, 0xFFFF, 0);
paint_util_force_set_general_support_height(height + 32, 0x20);
paint_util_set_general_support_height(height + 32, 0x20);
}
/**