More updates to sync with raylib master

This commit fixes some additional issues revealed by trying to compile the
examples.

Author: pineapplemachine

examples/core/core_random_values.cpp

@@ -47,7 +47,7 @@ int main() {
 
             DrawText("Every 2 seconds a new random value is generated:", 130, 100, 20, MAROON);
 
-            DrawText(FormatText("%i", randValue), 360, 180, 80, LIGHTGRAY);
+            DrawText(TextFormat("%i", randValue), 360, 180, 80, LIGHTGRAY);
         }
         EndDrawing();
         //----------------------------------------------------------------------------------

examples/models/models_first_person_maze.cpp

@@ -30,7 +30,7 @@ int main(void)
 
     // NOTE: By default each cube is mapped to one part of texture atlas
     raylib::Texture texture("resources/cubicmap_atlas.png");    // Load map texture
-    model.materials[0].maps[MAP_DIFFUSE].texture = texture;     // Set map diffuse texture
+    model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture;     // Set map diffuse texture
 
     // Get map image data to be used for collision detection
     Color *mapPixels = imMap.LoadColors();

examples/shapes/shapes_collision_area.cpp

@@ -89,7 +89,7 @@ int main(void)
                 DrawText("COLLISION!", GetScreenWidth()/2 - MeasureText("COLLISION!", 20)/2, screenUpperLimit/2 - 10, 20, BLACK);
 
                 // Draw collision area
-                DrawText(FormatText("Collision Area: %i", (int)boxCollision.width*(int)boxCollision.height), GetScreenWidth()/2 - 100, screenUpperLimit + 10, 20, BLACK);
+                DrawText(TextFormat("Collision Area: %i", (int)boxCollision.width*(int)boxCollision.height), GetScreenWidth()/2 - 100, screenUpperLimit + 10, 20, BLACK);
             }
 
             DrawFPS(10, 10);

examples/textures/textures_bunnymark.cpp

@@ -103,8 +103,8 @@ int main(void)
             }
 
             DrawRectangle(0, 0, screenWidth, 40, BLACK);
-            DrawText(FormatText("bunnies: %i", bunnies.size()), 120, 10, 20, GREEN);
-            DrawText(FormatText("batched draw calls: %i", 1 + bunnies.size()/MAX_BATCH_ELEMENTS), 320, 10, 20, MAROON);
+            DrawText(TextFormat("bunnies: %i", bunnies.size()), 120, 10, 20, GREEN);
+            DrawText(TextFormat("batched draw calls: %i", 1 + bunnies.size()/MAX_BATCH_ELEMENTS), 320, 10, 20, MAROON);
 
             DrawFPS(10, 10);
         }

include/Color.hpp

@@ -46,7 +46,7 @@ class Color : public ::Color {
     /**
      * Get Color structure from hexadecimal value
      */
-    Color(int hexValue) {
+    Color(unsigned int hexValue) {
         set(::GetColor(hexValue));
     }
 
@@ -199,7 +199,7 @@ class Color : public ::Color {
         return *this;
     }
 
-    inline Color& DrawRectangleLines(::Rectangle rec, int lineThick) {
+    inline Color& DrawRectangleLines(::Rectangle rec, float lineThick) {
         ::DrawRectangleLinesEx(rec, lineThick, *this);
         return *this;
     }

include/Font.hpp

@@ -46,7 +46,7 @@ class Font : public ::Font {
         other.baseSize = 0;
         other.glyphCount = 0;
         other.glyphPadding = 0;
-        other.texture = { 0 };
+        other.texture = {};
         other.recs = nullptr;
         other.glyphs = nullptr;
     }
@@ -84,7 +84,7 @@ class Font : public ::Font {
         other.baseSize = 0;
         other.glyphCount = 0;
         other.glyphPadding = 0;
-        other.texture = { 0 };
+        other.texture = {};
         other.recs = nullptr;
         other.glyphs = nullptr;
 

include/Material.hpp

@@ -30,7 +30,7 @@ class Material : public ::Material {
         set(other);
 
         other.maps = nullptr;
-        other.shader = { 0 };
+        other.shader = {};
     }
 
     ~Material() {
@@ -68,7 +68,7 @@ class Material : public ::Material {
         set(other);
 
         other.maps = nullptr;
-        other.shader = { 0 };
+        other.shader = {};
 
         return *this;
     }

include/Music.hpp

@@ -39,7 +39,7 @@ class Music : public ::Music {
         other.ctxData = nullptr;
         other.looping = false;
         other.frameCount = 0;
-        other.stream = { 0 };
+        other.stream = {};
     }
 
     /**
@@ -74,7 +74,7 @@ class Music : public ::Music {
         other.ctxData = nullptr;
         other.looping = false;
         other.frameCount = 0;
-        other.stream = { 0 };
+        other.stream = {};
 
         return *this;
     }

include/Rectangle.hpp

@@ -81,7 +81,7 @@ class Rectangle : public ::Rectangle {
         return *this;
     }
 
-    inline Rectangle& DrawLines(::Color color, int lineThick) {
+    inline Rectangle& DrawLines(::Color color, float lineThick) {
         ::DrawRectangleLinesEx(*this, lineThick, color);
         return *this;
     }
@@ -91,8 +91,8 @@ class Rectangle : public ::Rectangle {
         return *this;
     }
 
-    inline Rectangle& DrawRoundedLines(float roundness, int segments, int lineThick,
-            ::Color color) {
+    inline Rectangle& DrawRoundedLines(float roundness, int segments,
+            float lineThick, ::Color color) {
         ::DrawRectangleRoundedLines(*this, roundness, segments, lineThick, color);
         return *this;
     }

include/RenderTexture.hpp

@@ -26,8 +26,8 @@ class RenderTexture : public ::RenderTexture {
         set(other);
 
         other.id = 0;
-        other.texture = { 0 };
-        other.depth = { 0 };
+        other.texture = {};
+        other.depth = {};
     }
 
     GETTERSETTER(unsigned int, Id, id)
@@ -50,8 +50,8 @@ class RenderTexture : public ::RenderTexture {
         set(other);
 
         other.id = 0;
-        other.texture = { 0 };
-        other.depth = { 0 };
+        other.texture = {};
+        other.depth = {};
 
         return *this;
     }