forked from mirror/OpenTTD
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
#include "safeguards.h"
|
||||
|
||||
/* virtual */ uint32 TownScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
|
||||
/* virtual */ uint32_t TownScopeResolver::GetVariable(byte variable, uint32_t parameter, bool *available) const
|
||||
{
|
||||
switch (variable) {
|
||||
/* Larger towns */
|
||||
@@ -29,7 +29,7 @@
|
||||
/* Get a variable from the persistent storage */
|
||||
case 0x7C: {
|
||||
/* Check the persistent storage for the GrfID stored in register 100h. */
|
||||
uint32 grfid = GetRegister(0x100);
|
||||
uint32_t grfid = GetRegister(0x100);
|
||||
if (grfid == 0xFFFFFFFF) {
|
||||
if (this->ro.grffile == nullptr) return 0;
|
||||
grfid = this->ro.grffile->grfid;
|
||||
@@ -116,7 +116,7 @@
|
||||
return UINT_MAX;
|
||||
}
|
||||
|
||||
/* virtual */ void TownScopeResolver::StorePSA(uint pos, int32 value)
|
||||
/* virtual */ void TownScopeResolver::StorePSA(uint pos, int32_t value)
|
||||
{
|
||||
if (this->readonly) return;
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
if (this->ro.grffile == nullptr) return;
|
||||
|
||||
/* Check the persistent storage for the GrfID stored in register 100h. */
|
||||
uint32 grfid = GetRegister(0x100);
|
||||
uint32_t grfid = GetRegister(0x100);
|
||||
|
||||
/* A NewGRF can only write in the persistent storage associated to its own GRFID. */
|
||||
if (grfid == 0xFFFFFFFF) grfid = this->ro.grffile->grfid;
|
||||
|
Reference in New Issue
Block a user