summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIlya Zhuravlev <zhuravlevilya@ya.ru>2013-01-04 23:39:12 +0400
committerIlya Zhuravlev <zhuravlevilya@ya.ru>2013-01-04 23:39:12 +0400
commit099d7ff2ad73b55b6227fd36ba56b49034b56354 (patch)
tree2b37ba95c0c90b29f65a85048f4b687d659b9b93 /src
parent46d431e7c3cb1345c34613647a6eb61aabeb087a (diff)
downloadminetest-099d7ff2ad73b55b6227fd36ba56b49034b56354.tar.gz
minetest-099d7ff2ad73b55b6227fd36ba56b49034b56354.tar.bz2
minetest-099d7ff2ad73b55b6227fd36ba56b49034b56354.zip
"or" should be "||". Don't use "or", "and", etc.. It breaks build.
Diffstat (limited to 'src')
-rw-r--r--src/guiFormSpecMenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index e1ccee91a..a1da09ee1 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -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(";");