mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Fix '-Wpedantic' warnings under gcc 10.x

Browse source
This commit is contained in:
Vittorio Romeo 2021-04-11 00:59:05 +01:00 committed by Ethan Lee
parent 6e1054e362
commit 082a0c2205
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop_version/src/Game.h
View file

@ -79,9 +79,9 @@ namespace Menu
timetrialcomplete, timetrialcomplete,
timetrialcomplete2, timetrialcomplete2,
timetrialcomplete3, timetrialcomplete3,
gamecompletecontinue, gamecompletecontinue
};
}; };
}
struct MenuStackFrame struct MenuStackFrame
{ {

14
desktop_version/src/Graphics.cpp
View file

@ -398,21 +398,21 @@ int Graphics::bfontlen(uint32_t ch)
void Graphics::MakeTileArray(void) void Graphics::MakeTileArray(void)
{ {
PROCESS_TILESHEET(tiles, 8, ) PROCESS_TILESHEET(tiles, 8, {})
PROCESS_TILESHEET(tiles2, 8, ) PROCESS_TILESHEET(tiles2, 8, {})
PROCESS_TILESHEET(tiles3, 8, ) PROCESS_TILESHEET(tiles3, 8, {})
PROCESS_TILESHEET(entcolours, 8, ) PROCESS_TILESHEET(entcolours, 8, {})
} }
void Graphics::maketelearray(void) void Graphics::maketelearray(void)
{ {
PROCESS_TILESHEET_RENAME(teleporter, tele, 96, ) PROCESS_TILESHEET_RENAME(teleporter, tele, 96, {})
} }
void Graphics::MakeSpriteArray(void) void Graphics::MakeSpriteArray(void)
{ {
PROCESS_TILESHEET(sprites, 32, ) PROCESS_TILESHEET(sprites, 32, {})
PROCESS_TILESHEET(flipsprites, 32, ) PROCESS_TILESHEET(flipsprites, 32, {})
} }
#undef PROCESS_TILESHEET #undef PROCESS_TILESHEET

14
desktop_version/src/editor.cpp
View file

@ -195,14 +195,14 @@ static std::string NAME(const std::string& buf) \
return find_tag(buf, "<" TAG ">", "</" TAG ">"); \ return find_tag(buf, "<" TAG ">", "</" TAG ">"); \
} }
TAG_FINDER(find_metadata, "MetaData"); //only for checking that it exists TAG_FINDER(find_metadata, "MetaData") //only for checking that it exists
TAG_FINDER(find_creator, "Creator"); TAG_FINDER(find_creator, "Creator")
TAG_FINDER(find_title, "Title"); TAG_FINDER(find_title, "Title")
TAG_FINDER(find_desc1, "Desc1"); TAG_FINDER(find_desc1, "Desc1")
TAG_FINDER(find_desc2, "Desc2"); TAG_FINDER(find_desc2, "Desc2")
TAG_FINDER(find_desc3, "Desc3"); TAG_FINDER(find_desc3, "Desc3")
TAG_FINDER(find_website, "website"); TAG_FINDER(find_website, "website")
#undef TAG_FINDER #undef TAG_FINDER