Merge branch 'signal_tunnels_bridges' into jgrpp
# 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/misc.cpp # src/openttd.cpp # src/pbs.cpp # src/saveload/extended_ver_sl.cpp # src/saveload/saveload.cpp # src/signal.cpp # src/train_cmd.cpp # src/tunnelbridge_map.hpull/8/head
Jonathan G Rennison
8 years ago
commit
f82feb160f
@ -0,0 +1,75 @@
|
||||
/* $Id$ */
|
||||
|
||||
/*
|
||||
* This file is part of OpenTTD.
|
||||
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/** @file bridge_signal_map.h Map accessor functions for bridge signal simulation. */
|
||||
|
||||
#ifndef BRIDGE_SIGNAL_MAP_H
|
||||
#define BRIDGE_SIGNAL_MAP_H
|
||||
|
||||
#include "tile_type.h"
|
||||
#include "map_func.h"
|
||||
#include "signal_type.h"
|
||||
#include "core/bitmath_func.hpp"
|
||||
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
|
||||
struct LongBridgeSignalStorage {
|
||||
std::vector<uint64> signal_red_bits;
|
||||
};
|
||||
|
||||
extern std::unordered_map<TileIndex, LongBridgeSignalStorage> _long_bridge_signal_sim_map;
|
||||
|
||||
SignalState GetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal);
|
||||
|
||||
static inline SignalState GetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal)
|
||||
{
|
||||
if (signal < 15) {
|
||||
return GB(_m[t].m2, signal, 1) ? SIGNAL_STATE_RED : SIGNAL_STATE_GREEN;
|
||||
} else {
|
||||
return GetBridgeEntranceSimulatedSignalStateExtended(t, signal);
|
||||
}
|
||||
}
|
||||
|
||||
void SetBridgeEntranceSimulatedSignalStateExtended(TileIndex t, uint16 signal, SignalState state);
|
||||
|
||||
static inline void SetBridgeEntranceSimulatedSignalState(TileIndex t, uint16 signal, SignalState state)
|
||||
{
|
||||
if (signal < 15) {
|
||||
SB(_m[t].m2, signal, 1, (state == SIGNAL_STATE_RED) ? 1 : 0);
|
||||
} else {
|
||||
SetBridgeEntranceSimulatedSignalStateExtended(t, signal, state);
|
||||
}
|
||||
}
|
||||
|
||||
void SetAllBridgeEntranceSimulatedSignalsGreenExtended(TileIndex t);
|
||||
|
||||
static inline void SetAllBridgeEntranceSimulatedSignalsGreen(TileIndex t)
|
||||
{
|
||||
if (_m[t].m2 & 0x8000) {
|
||||
SetAllBridgeEntranceSimulatedSignalsGreenExtended(t);
|
||||
} else {
|
||||
_m[t].m2 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ClearBridgeEntranceSimulatedSignalsExtended(TileIndex t);
|
||||
|
||||
static inline void ClearBridgeEntranceSimulatedSignals(TileIndex t)
|
||||
{
|
||||
if (_m[t].m2 & 0x8000) {
|
||||
ClearBridgeEntranceSimulatedSignalsExtended(t);
|
||||
} else {
|
||||
_m[t].m2 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void ClearBridgeSimulatedSignalMapping();
|
||||
|
||||
#endif /* BRIDGE_SIGNAL_MAP_H */
|
||||
@ -0,0 +1,58 @@
|
||||
/* $Id$ */
|
||||
|
||||
/*
|
||||
* This file is part of OpenTTD.
|
||||
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
|
||||
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/** @file bridge_signal_sl.cpp Code handling saving and loading of data for signal on bridges */
|
||||
|
||||
#include "../stdafx.h"
|
||||
#include "../bridge_signal_map.h"
|
||||
#include "saveload.h"
|
||||
#include <vector>
|
||||
|
||||
/** stub save header struct */
|
||||
struct LongBridgeSignalStorageStub {
|
||||
uint32 length;
|
||||
};
|
||||
|
||||
static const SaveLoad _long_bridge_signal_storage_stub_desc[] = {
|
||||
SLE_VAR(LongBridgeSignalStorageStub, length, SLE_UINT32),
|
||||
SLE_END()
|
||||
};
|
||||
|
||||
static void Load_XBSS()
|
||||
{
|
||||
int index;
|
||||
LongBridgeSignalStorageStub stub;
|
||||
while ((index = SlIterateArray()) != -1) {
|
||||
LongBridgeSignalStorage &lbss = _long_bridge_signal_sim_map[index];
|
||||
SlObject(&stub, _long_bridge_signal_storage_stub_desc);
|
||||
lbss.signal_red_bits.resize(stub.length);
|
||||
SlArray(&(lbss.signal_red_bits[0]), stub.length, SLE_UINT64);
|
||||
}
|
||||
}
|
||||
|
||||
static void RealSave_XBSS(const LongBridgeSignalStorage *lbss)
|
||||
{
|
||||
LongBridgeSignalStorageStub stub;
|
||||
stub.length = lbss->signal_red_bits.size();
|
||||
SlObject(&stub, _long_bridge_signal_storage_stub_desc);
|
||||
SlArray(const_cast<uint64*>(&(lbss->signal_red_bits[0])), stub.length, SLE_UINT64);
|
||||
}
|
||||
|
||||
static void Save_XBSS()
|
||||
{
|
||||
for (const auto &it : _long_bridge_signal_sim_map) {
|
||||
const LongBridgeSignalStorage &lbss = it.second;
|
||||
SlSetArrayIndex(it.first);
|
||||
SlAutolength((AutolengthProc*) RealSave_XBSS, const_cast<LongBridgeSignalStorage*>(&lbss));
|
||||
}
|
||||
}
|
||||
|
||||
extern const ChunkHandler _bridge_signal_chunk_handlers[] = {
|
||||
{ 'XBSS', Save_XBSS, Load_XBSS, NULL, NULL, CH_SPARSE_ARRAY | CH_LAST},
|
||||
};
|
||||
Loading…
Reference in New Issue