Fixes for testpaint

Test of `paint_launched_freefall_tower_section` is invalid. Do note this
function [expects another element right past the one just
passed](https://github.com/OpenRCT2/OpenRCT2/blob/d00aa2c/src/ride/thrill/launched_freefall.c#L147):

```
rct_map_element * nextMapElement = mapElement + 1;
```

but you pass only a single map element, which is not marked as last for
tile. The same prevails throughout other tests.
This commit is contained in:
Michał Janiszewski 2016-09-09 22:25:06 +02:00 committed by Marijn van der Werf
parent ef008d6fd2
commit 88ffe5f8c2
3 changed files with 13 additions and 8 deletions

View File

@ -492,6 +492,7 @@ static bool testTrackElement(uint8 rideType, uint8 trackType, utf8string *error)
}
uint8 rideIndex = 0;
rct_map_element mapElement = { 0 };
mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE;
mapElement.properties.track.type = trackType;
mapElement.base_height = 3;

View File

@ -229,15 +229,15 @@ namespace Intercept2
static utf8string getTunnelEdgeString(TunnelCall edge)
{
utf8string out = new utf8[5];
utf8string out = new utf8[6];
switch (edge.call) {
case TUNNELCALL_SKIPPED:
sprintf(out, " ");
sprintf(out, "%s", " ");
break;
case TUNNELCALL_NONE:
sprintf(out, " - ");
sprintf(out, "%s", " - ");
break;
case TUNNELCALL_CALL:
@ -259,8 +259,8 @@ namespace Intercept2
utf8string tlEdge = getTunnelEdgeString(tunnelCalls[direction][2]);
utf8string trEdge = getTunnelEdgeString(tunnelCalls[direction][3]);
printf(" %s %s ", tlEdge, trEdge);
delete tlEdge;
delete trEdge;
delete [] tlEdge;
delete [] trEdge;
}
printf("\n");
@ -273,8 +273,8 @@ namespace Intercept2
utf8string brEdge = getTunnelEdgeString(tunnelCalls[direction][0]);
utf8string blEdge = getTunnelEdgeString(tunnelCalls[direction][1]);
printf(" %s %s ", blEdge, brEdge);
delete blEdge;
delete brEdge;
delete [] blEdge;
delete [] brEdge;
}
printf("\n");
@ -293,12 +293,14 @@ namespace Intercept2
{
uint8 rideIndex = 0;
rct_map_element mapElement = {0};
mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE;
mapElement.properties.track.type = trackType;
mapElement.base_height = 3;
g_currently_drawn_item = &mapElement;
rct_map_element surfaceElement = {0};
surfaceElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE;
surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE;
surfaceElement.base_height = 2;
@ -459,6 +461,7 @@ namespace Intercept2
{
uint8 rideIndex = 0;
rct_map_element mapElement = {0};
mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE;
mapElement.properties.track.type = trackType;
mapElement.base_height = 3;
@ -649,6 +652,7 @@ namespace Intercept2
{
uint8 rideIndex = 0;
rct_map_element mapElement = {0};
mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE;
mapElement.properties.track.type = trackType;
mapElement.base_height = 3;

View File

@ -320,7 +320,7 @@ int main(int argc, char *argv[]) {
for (auto &&failure : failures) {
ColouredPrintF(CLIColour::RED, "[ FAILED ] ");
printf("%s\n", failure);
delete(failure);
delete [] failure;
}
printf("\n");