Changeset 3494

Timestamp:

11/08/10 15:46:48 (3 years ago)

Author:

helios2000

Message:

• Fixed the warnings that were introduced by the light branch merge.

Location:

trunk/engine/core

Files:

• controller/enginesettings.cpp (modified) (1 diff)
• view/renderers/instancerenderer.cpp (modified) (3 diffs)
• view/renderers/lightrenderer.h (modified) (1 diff)

trunk/engine/core/controller/enginesettings.cpp

@@ -51 +51 @@
                 m_defaultfontsize(8),
                 m_defaultfontglyphs(""),
-                m_lighting(0),
-                m_iscolorkeyenabled(false){
+                m_iscolorkeyenabled(false),
+                m_lighting(0) {
                         m_colorkey.r = 255;
                         m_colorkey.g = 0;

trunk/engine/core/view/renderers/instancerenderer.cpp

@@ -169 +169 @@
                                         std::list<std::string>::iterator group_it = infoa.groups.begin();
                                         for(;group_it != infoa.groups.end(); ++group_it) {
-                                                if(str_name.find((*group_it)) != -1) {
+                                                if(str_name.find((*group_it)) != std::string::npos) {
                                                         ScreenPoint p;
                                                         Rect rec;
@@ -219 +219 @@
                                         std::list<std::string>::iterator unlit_it = m_unlit_groups.begin();
                                         for(;unlit_it != m_unlit_groups.end(); ++unlit_it) {
-                                                if(lit_name.find(*unlit_it) != -1) {
+                                                if(lit_name.find(*unlit_it) != std::string::npos) {
                                                         m_renderbackend->setStencilTest(255, 2, 7);
                                                         found = true;
@@ -480 +480 @@
                         std::list<std::string>::iterator unlit_it = m_unlit_groups.begin();
                         for(;unlit_it != m_unlit_groups.end(); ++unlit_it) {
-                                if((*group_it).find(*unlit_it) != -1) {
+                                if((*group_it).find(*unlit_it) != std::string::npos) {
                                         m_unlit_groups.remove(*unlit_it);
                                         break;

trunk/engine/core/view/renderers/lightrenderer.h

@@ -98 +98 @@
                 virtual float getAlpha() { return 0; };
                 virtual void removeStencil() {};
-                virtual std::vector<uint8_t> getColor() {};
+                virtual std::vector<uint8_t> getColor() { return std::vector<uint8_t>(); };
                 virtual float getRadius() { return 0; };
                 virtual int getSubdivisions() { return 0; };