Merge branch 'master' of https://github.com/raysan5/raylib into dr/mini_al

5 files changed, 3 insertions, 3 deletions

diff --git a/examples/textures/resources/fudesumi_BC1.dds b/examples/textures/resources/fudesumi_BC1.dds
deleted file mode 100644
index 4a5b21b9..00000000
--- a/examples/textures/resources/fudesumi_BC1.dds
+++ /dev/null
diff --git a/examples/textures/resources/fudesumi_BC3.dds b/examples/textures/resources/fudesumi_BC3.dds
deleted file mode 100644
index 0bf9c1de..00000000
--- a/examples/textures/resources/fudesumi_BC3.dds
+++ /dev/null
diff --git a/examples/textures/resources/fudesumi_ETC2.ktx b/examples/textures/resources/fudesumi_ETC2.ktx
deleted file mode 100644
index a0523770..00000000
--- a/examples/textures/resources/fudesumi_ETC2.ktx
+++ /dev/null
diff --git a/examples/textures/textures_image_text.c b/examples/textures/textures_image_text.c
index 0a939b8d..78d25c14 100644
--- a/examples/textures/textures_image_text.c
+++ b/examples/textures/textures_image_text.c
@@ -21,7 +21,7 @@ int main()
     InitWindow(screenWidth, screenHeight, "raylib [texture] example - image text drawing");
     
     // TTF Font loading with custom generation parameters
-    Font font = LoadFontEx("resources/KAISG.ttf", 64, 0, 0);
+    Font font = LoadFontEx("resources/KAISG.ttf", 64, 95, 0);
     
     Image parrots = LoadImage("resources/parrots.png"); // Load image in CPU memory (RAM)
 
diff --git a/examples/textures/textures_rectangle.c b/examples/textures/textures_rectangle.c
index c90db8ac..e1247746 100644
--- a/examples/textures/textures_rectangle.c
+++ b/examples/textures/textures_rectangle.c
@@ -27,7 +27,7 @@ int main()
     Texture2D scarfy = LoadTexture("resources/scarfy.png");        // Texture loading
 
     Vector2 position = { 350.0f, 280.0f };
-    Rectangle frameRec = { 0, 0, scarfy.width/6, scarfy.height };
+    Rectangle frameRec = { 0.0f, 0.0f, (float)scarfy.width/6, (float)scarfy.height };
     int currentFrame = 0;
     
     int framesCounter = 0;
@@ -50,7 +50,7 @@ int main()
             
             if (currentFrame > 5) currentFrame = 0;
             
-            frameRec.x = currentFrame*scarfy.width/6;
+            frameRec.x = (float)currentFrame*(float)scarfy.width/6;
         }
         
         if (IsKeyPressed(KEY_RIGHT)) framesSpeed++;