Changeset 120 for trunk/src

Timestamp:

06/15/13 02:05:49 (12 years ago)

Author:

epyon

Message:

• Nova now properly compiles and works under: mingw GCC 4.6 32-bit target mingw GCC 4.6 64-bit targte clang 3.2 32-bit target (64-bit clang doesn't work under windows)
• warning removal will follow soon

Location:

trunk/src

Files:

• gl/gl_device.cc (modified) (1 diff)
• gui/gui_element.cc (modified) (2 diffs)
• library.cc (modified) (1 diff)
• object.cc (modified) (1 diff)

trunk/src/gl/gl_device.cc

@@ -74 +74 @@
         load_sdl_image_library();
         SDL_Surface* image = IMG_Load( filename.c_str() );
+        if (!image)
+        {
+                NV_LOG( LOG_ERROR, "Image file " << filename.c_str() << " not found!" );
+                return nullptr;
+        }
         image_data* data = new image_data( glm::ivec2( image->w, image->h ), image->format->BytesPerPixel, (nv::uint8*)image->pixels );
         return data;

trunk/src/gui/gui_element.cc

@@ -27 +27 @@
                 }
         }
+        //((environment*)m_root)->update( this, elapsed );
 }
 
@@ -90 +91 @@
         }
 
-        m_absolute = m_relative + pabsolute.upper_left;
+        m_absolute = m_relative + pabsolute.ul;
 
         for ( object* o : *this )

trunk/src/library.cc

@@ -115 +115 @@
 #if NV_PLATFORM == NV_WINDOWS
     // We do hate WinAPI for code like this, don't we?
-    LPVOID buffer;
+    LPTSTR buffer = NULL;
     FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &buffer, 0, NULL );

trunk/src/object.cc

@@ -7 +7 @@
 #include "nv/object.hh"
 
+#include <algorithm>
 #include "nv/root.hh"
 #include "nv/types.hh"