Merge branch 'master' into jgrpp
# Conflicts: # src/lang/afrikaans.txt # src/lang/basque.txt # src/lang/belarusian.txt # src/lang/brazilian_portuguese.txt # src/lang/bulgarian.txt # src/lang/catalan.txt # src/lang/croatian.txt # src/lang/czech.txt # src/lang/danish.txt # src/lang/dutch.txt # src/lang/english.txt # src/lang/english_AU.txt # src/lang/english_US.txt # src/lang/estonian.txt # src/lang/finnish.txt # src/lang/french.txt # src/lang/gaelic.txt # src/lang/galician.txt # src/lang/german.txt # src/lang/greek.txt # src/lang/hebrew.txt # src/lang/hungarian.txt # src/lang/icelandic.txt # src/lang/indonesian.txt # src/lang/irish.txt # src/lang/italian.txt # src/lang/japanese.txt # src/lang/korean.txt # src/lang/latin.txt # src/lang/latvian.txt # src/lang/lithuanian.txt # src/lang/luxembourgish.txt # src/lang/norwegian_bokmal.txt # src/lang/norwegian_nynorsk.txt # src/lang/polish.txt # src/lang/portuguese.txt # src/lang/romanian.txt # src/lang/russian.txt # src/lang/serbian.txt # src/lang/simplified_chinese.txt # src/lang/slovak.txt # src/lang/slovenian.txt # src/lang/spanish.txt # src/lang/spanish_MX.txt # src/lang/swedish.txt # src/lang/tamil.txt # src/lang/thai.txt # src/lang/traditional_chinese.txt # src/lang/turkish.txt # src/lang/ukrainian.txt # src/lang/unfinished/persian.txt # src/lang/vietnamese.txt # src/lang/welsh.txt # src/rail_cmd.cpp # src/station_cmd.cpp
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
|
||||
/* static */ ScriptGroup::GroupID ScriptGroup::CreateGroup(ScriptVehicle::VehicleType vehicle_type)
|
||||
{
|
||||
if (!ScriptObject::DoCommand(0, (::VehicleType)vehicle_type, 0, CMD_CREATE_GROUP, NULL, &ScriptInstance::DoCommandReturnGroupID)) return GROUP_INVALID;
|
||||
if (!ScriptObject::DoCommand(0, (::VehicleType)vehicle_type, INVALID_GROUP, CMD_CREATE_GROUP, NULL, &ScriptInstance::DoCommandReturnGroupID)) return GROUP_INVALID;
|
||||
|
||||
/* In case of test-mode, we return GroupID 0 */
|
||||
return (ScriptGroup::GroupID)0;
|
||||
|
@@ -578,6 +578,7 @@ public:
|
||||
|
||||
/**
|
||||
* Removes the given vehicle from a shared orders list.
|
||||
* After unsharing orders, the orders list of the vehicle is empty.
|
||||
* @param vehicle_id The vehicle to remove from the shared order list.
|
||||
* @pre ScriptVehicle::IsValidVehicle(vehicle_id).
|
||||
* @return True if and only if the unsharing succeeded.
|
||||
|
Reference in New Issue
Block a user