Mercurial > fife-parpg
comparison engine/core/view/renderers/genericrenderer.cpp @ 36:6f1227f4932b
Fixed and's and or's.
author | aldart@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Sat, 12 Jul 2008 11:29:41 +0000 |
parents | 75b6394ced14 |
children | 90005975cdbb |
comparison
equal
deleted
inserted
replaced
35:bf7f838e6684 | 36:6f1227f4932b |
---|---|
114 } | 114 } |
115 m_location = relative_location; | 115 m_location = relative_location; |
116 m_point = relative_point; | 116 m_point = relative_point; |
117 } | 117 } |
118 void GenericRendererNode::setRelative(const Point &relative_point) { | 118 void GenericRendererNode::setRelative(const Point &relative_point) { |
119 if(m_instance == NULL or m_location == NULL) { | 119 if(m_instance == NULL || m_location == NULL) { |
120 throw NotSupported("No instance or location attached."); | 120 throw NotSupported("No instance or location attached."); |
121 } | 121 } |
122 m_point = relative_point; | 122 m_point = relative_point; |
123 } | 123 } |
124 | 124 |
127 throw NotSupported("No instance attached."); | 127 throw NotSupported("No instance attached."); |
128 } | 128 } |
129 return m_instance; | 129 return m_instance; |
130 } | 130 } |
131 Location* GenericRendererNode::getAttachedLocation() { | 131 Location* GenericRendererNode::getAttachedLocation() { |
132 if(m_instance != NULL or m_location == NULL) { | 132 if(m_instance != NULL || m_location == NULL) { |
133 throw NotSupported("No location attached."); | 133 throw NotSupported("No location attached."); |
134 } | 134 } |
135 return m_location; | 135 return m_location; |
136 } | 136 } |
137 Point GenericRendererNode::getAttachedPoint() { | 137 Point GenericRendererNode::getAttachedPoint() { |
138 if(m_instance != NULL or m_location != NULL) { | 138 if(m_instance != NULL || m_location != NULL) { |
139 throw NotSupported("No point attached."); | 139 throw NotSupported("No point attached."); |
140 } | 140 } |
141 return m_point; | 141 return m_point; |
142 } | 142 } |
143 | 143 |
144 Location* GenericRendererNode::getOffsetLocation() { | 144 Location* GenericRendererNode::getOffsetLocation() { |
145 if(m_instance == NULL or m_location == NULL) { | 145 if(m_instance == NULL || m_location == NULL) { |
146 throw NotSupported("No location as offset used."); | 146 throw NotSupported("No location as offset used."); |
147 } | 147 } |
148 return m_location; | 148 return m_location; |
149 } | 149 } |
150 Point GenericRendererNode::getOffsetPoint() { | 150 Point GenericRendererNode::getOffsetPoint() { |
151 if(m_instance == NULL and m_location == NULL) { | 151 if(m_instance == NULL && m_location == NULL) { |
152 throw NotSupported("No point as offset used."); | 152 throw NotSupported("No point as offset used."); |
153 } | 153 } |
154 return m_point; | 154 return m_point; |
155 } | 155 } |
156 | 156 |