dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'template_train_replacement-sx' into jgrpp

Browse Source 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2016-02-14 17:55:51 +00:00
parent 1f5535c0b1 99509acd1d
commit 580b2f7584
54 changed files with 4946 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ground_vehicle.hpp
View File

@@ -298,6 +298,16 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
*/
inline void ClearFreeWagon() { ClrBit(this->subtype, GVSF_FREE_WAGON); }
/**
* Set a vehicle as a virtual vehicle.
*/
inline void SetVirtual() { SetBit(this->subtype, GVSF_VIRTUAL); }
/**
* Clear a vehicle from being a virtual vehicle.
*/
inline void ClearVirtual() { ClrBit(this->subtype, GVSF_VIRTUAL); }
/**
* Set a vehicle as a multiheaded engine.
*/
@@ -332,6 +342,12 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
*/
inline bool IsMultiheaded() const { return HasBit(this->subtype, GVSF_MULTIHEADED); }
/**
* Tell if we are dealing with a virtual vehicle (used for templates).
* @return True if the vehicle is a virtual vehicle.
*/
inline bool IsVirtual() const { return HasBit(this->subtype, GVSF_VIRTUAL); }
/**
* Tell if we are dealing with the rear end of a multiheaded engine.
* @return True if the engine is the rear part of a dualheaded engine.