Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codefix: Implement explicit ByteReader::PeekDWord() instead of type-punning pointer. (#12928)

Browse Source 
(cherry picked from commit 9631c68ce6)

# Conflicts:
#	src/newgrf.cpp
This commit is contained in:
Peter Nelson 2024-09-12 06:49:20 +01:00 committed by Jonathan G Rennison
parent c08ced0662
commit 99f8989f0c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/newgrf.cpp
View File

@ -12,6 +12,7 @@
#include <stdarg.h>
#include "newgrf_internal.h"
#include "core/backup_type.hpp"
#include "core/container_func.hpp"
#include "core/bit_cast.hpp"
#include "debug.h"
@ -158,6 +159,12 @@ public:
return val | (ReadWord() << 16);
}
uint32_t PeekDWord()
{
AutoRestoreBackup backup(this->data, this->data);
return this->ReadDWord();
}
uint32_t ReadVarSize(uint8_t size)
{
switch (size) {
@ -1950,7 +1957,7 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
dts->consistent_max_offset = UINT16_MAX; // Spritesets are unknown, so no limit.
if (buf.HasData(4) && *(unaligned_uint32*)buf.Data() == 0) {
if (buf.HasData(4) && buf.PeekDWord() == 0) {
buf.Skip(4);
extern const DrawTileSprites _station_display_datas_rail[8];
dts->Clone(&_station_display_datas_rail[t % 8]);