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

Use std::move for RideCreateAction::Execute 

Fixes compilation with ICC and Xcode 8
This commit is contained in:
Michał Janiszewski 2017-08-20 23:54:17 +02:00
parent eba0054c0b
commit cb7c0d1df4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/actions/RideCreateAction.hpp
View File

@ -97,7 +97,7 @@ public:
{ {
res->Error = GA_ERROR::INVALID_PARAMETERS; res->Error = GA_ERROR::INVALID_PARAMETERS;
res->ErrorMessage = STR_INVALID_RIDE_TYPE; res->ErrorMessage = STR_INVALID_RIDE_TYPE;
return res; return std::move(res);
} }
} }
} }
@ -106,7 +106,7 @@ public:
{ {
res->Error = GA_ERROR::INVALID_PARAMETERS; res->Error = GA_ERROR::INVALID_PARAMETERS;
res->ErrorMessage = STR_INVALID_RIDE_TYPE; res->ErrorMessage = STR_INVALID_RIDE_TYPE;
return res; return std::move(res);
} }
sint32 rideEntryIndex = subType; sint32 rideEntryIndex = subType;
@ -115,7 +115,7 @@ public:
{ {
res->Error = GA_ERROR::DISALLOWED; res->Error = GA_ERROR::DISALLOWED;
res->ErrorMessage = STR_TOO_MANY_RIDES; res->ErrorMessage = STR_TOO_MANY_RIDES;
return res; return std::move(res);
} }
res->rideIndex = rideIndex; res->rideIndex = rideIndex;
@ -128,7 +128,7 @@ public:
log_warning("Invalid request for ride %u", rideIndex); log_warning("Invalid request for ride %u", rideIndex);
res->Error = GA_ERROR::UNKNOWN; res->Error = GA_ERROR::UNKNOWN;
res->ErrorMessage = STR_UNKNOWN_OBJECT_TYPE; res->ErrorMessage = STR_UNKNOWN_OBJECT_TYPE;
return res; return std::move(res);
} }
ride->type = rideType; ride->type = rideType;
@ -308,7 +308,7 @@ public:
res->ExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION; res->ExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION;
res->Position.x = (uint16)0x8000; res->Position.x = (uint16)0x8000;
return res; return std::move(res);
} }
}; };