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

Merge branch 'jgrpp' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
This commit is contained in:
Jonathan G Rennison
2021-10-29 22:22:54 +01:00
parent 24c6dfe872 e34cc229d1
commit 61cc60099a
45 changed files with 382 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicle_base.h
View File

@@ -1387,7 +1387,7 @@ public:
inline void UpdateImageStateUsingMapDirection(VehicleSpriteSeq &seq)
{
this->UpdateImageState(this->GetMapImageDirection(), seq);
this->UpdateImageState(((T *)this)->GetMapImageDirection(), seq);
}
private: