TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Compilation fixes for C++20

Browse source
This commit is contained in:
Jeff Hutchinson 2022-11-27 23:08:07 -05:00
parent e16351605b
commit 1940becb2d
40 changed files with 220 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/afx/ui/afxSpellButton.cpp
View file

@ -328,9 +328,9 @@ void afxSpellButton::setPage(U8 page)
update_bitmap();
}
char* afxSpellButton::formatDesc(char* buffer, int len) const
const char* afxSpellButton::formatDesc(char* buffer, int len) const
{
return (spellbook) ? spellbook->formatDesc(buffer, len, book_slot.x, book_slot.y) : (char*)"";
return (spellbook) ? spellbook->formatDesc(buffer, len, book_slot.x, book_slot.y) : "";
}
afxMagicSpellData* afxSpellButton::getSpellDataBlock() const

2
Engine/source/afx/ui/afxSpellButton.h
View file

@ -77,7 +77,7 @@ public:
void setBitmap(const char *name, bool placholder=false);
void setSpellBook(afxSpellBook*, U8 page);
void setPage(U8 page);
char* formatDesc(char* buffer, int len) const;
const char* formatDesc(char* buffer, int len) const;
afxMagicSpellData* getSpellDataBlock() const;
afxRPGMagicSpellData* getSpellRPGDataBlock() const;