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

Merge tag '12.0-beta1' into jgrpp-beta

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-02 17:51:38 +00:00
parent f764fcfb1f b67ef1e5b8
commit faf32200cf
146 changed files with 2391 additions and 2807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf_engine.cpp
View File

@@ -1329,13 +1329,13 @@ uint16 GetVehicleCallbackParent(CallbackID callback, uint32 param1, uint32 param
/* Callback 36 handlers */
uint GetVehicleProperty(const Vehicle *v, PropertyID property, uint orig_value)
int GetVehicleProperty(const Vehicle *v, PropertyID property, int orig_value, bool is_signed)
{
return GetEngineProperty(v->engine_type, property, orig_value, v);
return GetEngineProperty(v->engine_type, property, orig_value, v, is_signed);
}
uint GetEngineProperty(EngineID engine, PropertyID property, uint orig_value, const Vehicle *v)
int GetEngineProperty(EngineID engine, PropertyID property, int orig_value, const Vehicle *v, bool is_signed)
{
const Engine *e = Engine::Get(engine);
if (static_cast<uint>(property) < 64 && !HasBit(e->cb36_properties_used, property)) return orig_value;
@@ -1348,7 +1348,14 @@ uint GetEngineProperty(EngineID engine, PropertyID property, uint orig_value, co
}
}
uint16 callback = object.ResolveCallback();
if (callback != CALLBACK_FAILED) return callback;
if (callback != CALLBACK_FAILED) {
if (is_signed) {
/* Sign extend 15 bit integer */
return static_cast<int16>(callback << 1) / 2;
} else {
return callback;
}
}
return orig_value;
}