Skip to content

Commit

Permalink
Keep the typo in the configuration variable name for 2.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
blast007 committed Nov 30, 2024
1 parent 76741b8 commit e225de3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/bzflag/DisplayMenu.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ void DisplayMenu::resize(int _width, int _height)
// Lighting
if (BZDBCache::lighting)
{
if (BZDB.isTrue("tessellation"))
if (BZDB.isTrue("tesselation"))
((HUDuiList*)listHUD[i++])->setIndex(2);
else
((HUDuiList*)listHUD[i++])->setIndex(1);
Expand Down Expand Up @@ -444,7 +444,7 @@ void DisplayMenu::callback(HUDuiControl* w, const void* data)
{
bool oldLighting = BZDBCache::lighting;
BZDB.set("lighting", list->getIndex() == 0 ? "0" : "1");
BZDB.set("tessellation", list->getIndex() == 2 ? "1" : "0");
BZDB.set("tesselation", list->getIndex() == 2 ? "1" : "0");
if (oldLighting != BZDBCache::lighting)
{
BZDB.set("texturereplace", (!BZDBCache::lighting &&
Expand Down
2 changes: 1 addition & 1 deletion src/bzflag/defaultBZDB.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ DefaultDBItem defaultDBItems[] =
{ "blend", "1", true, StateDatabase::ReadWrite, NULL },
{ "smooth", "1", true, StateDatabase::ReadWrite, NULL },
{ "lighting", "1", true, StateDatabase::ReadWrite, NULL },
{ "tessellation", "1", true, StateDatabase::ReadWrite, NULL },
{ "tesselation", "1", true, StateDatabase::ReadWrite, NULL },
{ "dither", "0", true, StateDatabase::ReadWrite, NULL },
{ "shadows", "1", true, StateDatabase::ReadWrite, NULL },
{ "stencilShadows", "1", true, StateDatabase::ReadWrite, NULL },
Expand Down
6 changes: 3 additions & 3 deletions src/common/BZDBCache.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void BZDBCache::init()
BZDB.addCallback("stencilShadows", clientCallback, NULL);
BZDB.addCallback("zbuffer", clientCallback, NULL);
BZDB.addCallback("useMeshForRadar", clientCallback, NULL);
BZDB.addCallback("tessellation", clientCallback, NULL);
BZDB.addCallback("tesselation", clientCallback, NULL);
BZDB.addCallback("lighting", clientCallback, NULL);
BZDB.addCallback("smooth", clientCallback, NULL);
BZDB.addCallback("colorful", clientCallback, NULL);
Expand Down Expand Up @@ -185,8 +185,8 @@ void BZDBCache::clientCallback(const std::string& name, void *)
zbuffer = BZDB.isTrue("zbuffer");
else if (name == "useMeshForRadar")
useMeshForRadar = BZDB.isTrue("useMeshForRadar");
else if (name == "tessellation")
tessellation = BZDB.isTrue("tessellation");
else if (name == "tesselation")
tessellation = BZDB.isTrue("tesselation");
else if (name == "lighting")
lighting = BZDB.isTrue("lighting");
else if (name == "smooth")
Expand Down

0 comments on commit e225de3

Please sign in to comment.