"or" should be "||". Don't use "or", "and", etc.. It breaks build.
authorIlya Zhuravlev <zhuravlevilya@ya.ru>
Fri, 4 Jan 2013 19:39:12 +0000 (23:39 +0400)
committerIlya Zhuravlev <zhuravlevilya@ya.ru>
Fri, 4 Jan 2013 19:39:12 +0000 (23:39 +0400)
src/guiFormSpecMenu.cpp

index e1ccee91a7a6bae5918fe34cfe92a04085b71b26..a1da09ee1615f76817a5f767643af5d970e43cae 100644 (file)
@@ -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(";");