# HG changeset patch
# User aldart@33b003aa-7bff-0310-803a-e67f0ece8222
# Date 1215862181 0
# Node ID 6f1227f4932bb6b927bbad21e3758c8b36c69079
# Parent  bf7f838e66843e42618cad127be5b51838078eda
Fixed and's and or's.

diff -r bf7f838e6684 -r 6f1227f4932b engine/core/view/renderers/genericrenderer.cpp
--- a/engine/core/view/renderers/genericrenderer.cpp	Sat Jul 12 02:50:09 2008 +0000
+++ b/engine/core/view/renderers/genericrenderer.cpp	Sat Jul 12 11:29:41 2008 +0000
@@ -116,7 +116,7 @@
 		m_point = relative_point;
 	}
 	void GenericRendererNode::setRelative(const Point &relative_point) {
-		if(m_instance == NULL or m_location == NULL) {
+		if(m_instance == NULL || m_location == NULL) {
 			throw NotSupported("No instance or location attached.");
 		}
 		m_point = relative_point;
@@ -129,26 +129,26 @@
 		return m_instance;
 	}
 	Location* GenericRendererNode::getAttachedLocation() {
-		if(m_instance != NULL or m_location == NULL) {
+		if(m_instance != NULL || m_location == NULL) {
 			throw NotSupported("No location attached.");
 		}
 		return m_location;
 	}
 	Point GenericRendererNode::getAttachedPoint() {
-		if(m_instance != NULL or m_location != NULL) {
+		if(m_instance != NULL || m_location != NULL) {
 			throw NotSupported("No point attached.");
 		}
 		return m_point;
 	}
 
 	Location* GenericRendererNode::getOffsetLocation() {
-		if(m_instance == NULL or m_location == NULL) {
+		if(m_instance == NULL || m_location == NULL) {
 			throw NotSupported("No location as offset used.");
 		}
 		return m_location;
 	}
 	Point GenericRendererNode::getOffsetPoint() {
-		if(m_instance == NULL and m_location == NULL) {
+		if(m_instance == NULL && m_location == NULL) {
 			throw NotSupported("No point as offset used.");
 		}
 		return m_point;