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

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sl/oldloader.h
View File

@@ -22,11 +22,11 @@ struct LoadgameState {
uint chunk_size;
bool decoding;
byte decode_char;
uint8_t decode_char;
uint buffer_count;
uint buffer_cur;
byte buffer[BUFFER_SIZE];
uint8_t buffer[BUFFER_SIZE];
uint total_read;
};
@@ -96,7 +96,7 @@ struct OldChunks {
static_assert(sizeof(TileIndex) == 4);
extern uint _bump_assert_value;
byte ReadByte(LoadgameState *ls);
uint8_t ReadByte(LoadgameState *ls);
bool LoadChunk(LoadgameState *ls, void *base, const OldChunks *chunks);
bool LoadTTDMain(LoadgameState *ls);
@@ -104,7 +104,7 @@ bool LoadTTOMain(LoadgameState *ls);
inline uint16_t ReadUint16(LoadgameState *ls)
{
byte x = ReadByte(ls);
uint8_t x = ReadByte(ls);
return x | ReadByte(ls) << 8;
}