From 2c29a93f1f71e5736eae31ff5350ab7209dce42b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 2 Oct 2022 20:45:00 +0200 Subject: [PATCH] - fixed compile. --- src/common/console/c_commandbuffer.h | 2 +- src/common/platform/posix/i_system.h | 2 +- src/common/textures/formats/rawpagetexture.cpp | 2 +- src/common/textures/texturemanager.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/console/c_commandbuffer.h b/src/common/console/c_commandbuffer.h index be257fb24..179651c45 100644 --- a/src/common/console/c_commandbuffer.h +++ b/src/common/console/c_commandbuffer.h @@ -29,7 +29,7 @@ public: void Draw(int x, int y, int scale, bool cursor); unsigned CalcCellSize(unsigned length); unsigned CharsForCells(unsigned cellin, bool *overflow); - void MakeStartPosGood();; + void MakeStartPosGood(); void CursorStart(); void CursorEnd(); diff --git a/src/common/platform/posix/i_system.h b/src/common/platform/posix/i_system.h index ae3faa80b..3b3489310 100644 --- a/src/common/platform/posix/i_system.h +++ b/src/common/platform/posix/i_system.h @@ -38,7 +38,7 @@ void I_PrintStr (const char *str); void I_SetIWADInfo (); // Pick from multiple IWADs to use -int I_PickIWad (WadStuff *wads, int numwads, bool queryiwad, int defaultiwad); +int I_PickIWad (WadStuff *wads, int numwads, bool queryiwad, int defaultiwad, int&); // [RH] Checks the registry for Steam's install path, so we can scan its // directories for IWADs if the user purchased any through Steam. diff --git a/src/common/textures/formats/rawpagetexture.cpp b/src/common/textures/formats/rawpagetexture.cpp index c2b26ba23..1ee29e13d 100644 --- a/src/common/textures/formats/rawpagetexture.cpp +++ b/src/common/textures/formats/rawpagetexture.cpp @@ -73,7 +73,7 @@ bool CheckIfRaw(FileReader & data, int desiredsize) data.Seek(0, FileReader::SeekSet); auto bits = data.Read(data.GetLength()); - foo = (patch_t *)bits.Data();; + foo = (patch_t *)bits.Data(); height = LittleShort(foo->height); width = LittleShort(foo->width); diff --git a/src/common/textures/texturemanager.cpp b/src/common/textures/texturemanager.cpp index 654519d0f..21b9013f7 100644 --- a/src/common/textures/texturemanager.cpp +++ b/src/common/textures/texturemanager.cpp @@ -1484,7 +1484,7 @@ int FTextureManager::CountLumpTextures (int lumpnum) if (lumpnum >= 0) { auto file = fileSystem.OpenFileReader (lumpnum); - uint32_t numtex = file.ReadUInt32();; + uint32_t numtex = file.ReadUInt32(); return int(numtex) >= 0 ? numtex : 0; }