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

Fix various compiler warnings

Browse Source 
See: #267
This commit is contained in:
Jonathan G Rennison
2021-06-11 22:54:27 +01:00
parent 97d5982cb5
commit 1002c6d9d2
46 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/saveload/signal_sl.cpp
View File

@@ -146,14 +146,14 @@ static void Save_SPRG()
// OK, we can now write out our programs
Buffer b;
WriteVLI(b, _signal_programs.size());
WriteVLI(b, (uint)_signal_programs.size());
for(ProgramList::iterator i = _signal_programs.begin(), e = _signal_programs.end();
i != e; ++i) {
SignalProgram *prog = i->second;
WriteVLI(b, prog->tile);
WriteVLI(b, prog->track);
WriteVLI(b, prog->instructions.size());
WriteVLI(b, (uint)prog->instructions.size());
for (SignalInstruction *insn : prog->instructions) {
WriteVLI(b, insn->Opcode());
if(insn->Opcode() != PSO_FIRST)
@@ -195,7 +195,7 @@ static void Save_SPRG()
}
}
uint size = b.size();
uint size = (uint)b.size();
SlSetLength(size);
for(uint i = 0; i < size; i++) {
SlWriteByte(b[i]); // TODO Gotta be a better way
@@ -223,14 +223,14 @@ typedef std::vector<Fixup> FixupList;
template<typename T>
static void MakeFixup(FixupList &l, T *&ir, uint id, SignalOpcode op = PSO_INVALID)
{
ir = reinterpret_cast<T*>(id);
ir = reinterpret_cast<T*>((size_t)id);
l.emplace_back(reinterpret_cast<SignalInstruction**>(&ir), op);
}
static void DoFixups(FixupList &l, InstructionList &il)
{
for (Fixup &i : l) {
uint id = reinterpret_cast<size_t>(*(i.ptr));
uint id = (uint)reinterpret_cast<size_t>(*(i.ptr));
if (id >= il.size())
NOT_REACHED();