From 099d7ff2ad73b55b6227fd36ba56b49034b56354 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <zhuravlevilya@ya.ru>
Date: Fri, 4 Jan 2013 23:39:12 +0400
Subject: [PATCH] "or" should be "||". Don't use "or", "and", etc.. It breaks
build.
---
src/guiFormSpecMenu.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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(";");
--
GitLab