"or" should be "||". Don't use "or", "and", etc.. It breaks build.

This commit is contained in:
Ilya Zhuravlev 2013-01-04 23:39:12 +04:00
parent 46d431e7c3
commit 099d7ff2ad

@ -318,7 +318,7 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
errorstream<<"WARNING: invalid use of background without a size[] element"<<std::endl;
m_backgrounds.push_back(ImageDrawSpec(name, pos, geom));
}
else if(type == "field" or type == "textarea")
else if(type == "field" || type == "textarea")
{
std::string fname = f.next(";");
std::string flabel = f.next(";");