Merge pull request #7 from raysan5/master

pull

62 files changed, 8 insertions, 6 deletions

diff --git a/games/drturtle/resources/fish.png b/games/drturtle/resources/fish.png
index 894dd1ca..dca5956e 100644
--- a/games/drturtle/resources/fish.png
+++ b/games/drturtle/resources/fish.png
diff --git a/games/drturtle/resources/gamera.png b/games/drturtle/resources/gamera.png
index 57127c10..9c2fea71 100644
--- a/games/drturtle/resources/gamera.png
+++ b/games/drturtle/resources/gamera.png
diff --git a/games/drturtle/resources/gframe.png b/games/drturtle/resources/gframe.png
index 87796af2..5946589e 100644
--- a/games/drturtle/resources/gframe.png
+++ b/games/drturtle/resources/gframe.png
diff --git a/games/drturtle/resources/komika.png b/games/drturtle/resources/komika.png
index 174d85b9..2c2ab714 100644
--- a/games/drturtle/resources/komika.png
+++ b/games/drturtle/resources/komika.png
diff --git a/games/drturtle/resources/mountains.png b/games/drturtle/resources/mountains.png
index 16917703..f193f504 100644
--- a/games/drturtle/resources/mountains.png
+++ b/games/drturtle/resources/mountains.png
diff --git a/games/drturtle/resources/orca.png b/games/drturtle/resources/orca.png
index 09aed574..b580ef07 100644
--- a/games/drturtle/resources/orca.png
+++ b/games/drturtle/resources/orca.png
diff --git a/games/drturtle/resources/sea.png b/games/drturtle/resources/sea.png
index ad8f22ef..34593536 100644
--- a/games/drturtle/resources/sea.png
+++ b/games/drturtle/resources/sea.png
diff --git a/games/drturtle/resources/shark.png b/games/drturtle/resources/shark.png
index 26c05ea5..24a56957 100644
--- a/games/drturtle/resources/shark.png
+++ b/games/drturtle/resources/shark.png
diff --git a/games/drturtle/resources/sky.png b/games/drturtle/resources/sky.png
index 5af8b6f7..e75715c9 100644
--- a/games/drturtle/resources/sky.png
+++ b/games/drturtle/resources/sky.png
diff --git a/games/drturtle/resources/swhale.png b/games/drturtle/resources/swhale.png
index be1d0c5c..5652928c 100644
--- a/games/drturtle/resources/swhale.png
+++ b/games/drturtle/resources/swhale.png
diff --git a/games/drturtle/resources/title.png b/games/drturtle/resources/title.png
index abe0f5b0..9ddd0de3 100644
--- a/games/drturtle/resources/title.png
+++ b/games/drturtle/resources/title.png
diff --git a/games/drturtle/resources/turtle.png b/games/drturtle/resources/turtle.png
index 4abe9f51..52ce9691 100644
--- a/games/drturtle/resources/turtle.png
+++ b/games/drturtle/resources/turtle.png
diff --git a/games/just_do/screens/screen_level06.c b/games/just_do/screens/screen_level06.c
index a5536aa4..ec72d70c 100644
--- a/games/just_do/screens/screen_level06.c
+++ b/games/just_do/screens/screen_level06.c
@@ -132,7 +132,7 @@ void DrawLevel06Screen(void)
         DrawRectangleRec(movingRecs[i], GRAY);
     }
     
-    if (!done & (mouseOverNum >= 0)) DrawRectangleLines(movingRecs[mouseOverNum].x - 5, movingRecs[mouseOverNum].y - 5, movingRecs[mouseOverNum].width + 10, movingRecs[mouseOverNum].height + 10, Fade(LIGHTGRAY, 0.8f));
+    if (!done && (mouseOverNum >= 0)) DrawRectangleLines(movingRecs[mouseOverNum].x - 5, movingRecs[mouseOverNum].y - 5, movingRecs[mouseOverNum].width + 10, movingRecs[mouseOverNum].height + 10, Fade(LIGHTGRAY, 0.8f));
         
     if (levelFinished)
     {
diff --git a/games/koala_seasons/screens/screen_gameplay.c b/games/koala_seasons/screens/screen_gameplay.c
index 6bbcfaaf..4d8ff04d 100644
--- a/games/koala_seasons/screens/screen_gameplay.c
+++ b/games/koala_seasons/screens/screen_gameplay.c
@@ -954,7 +954,7 @@ void UpdateGameplayScreen(void)
                     playerActive = false;
                     killer = 5;
                 }
-                else if (CheckCollisionRecs(bee, player) && (state == FINALFORM) && (state != KICK))
+                else if (CheckCollisionRecs(bee, player) && (state == FINALFORM))
                 {
                     isHitBee = true;
                     beeVelocity = 8;
diff --git a/games/light_my_ritual/resources/font_arcadian.png b/games/light_my_ritual/resources/font_arcadian.png
index 5c3df51a..7abcc197 100644
--- a/games/light_my_ritual/resources/font_arcadian.png
+++ b/games/light_my_ritual/resources/font_arcadian.png
diff --git a/games/light_my_ritual/resources/textures/back_title.png b/games/light_my_ritual/resources/textures/back_title.png
index 54921247..c6cf9698 100644
--- a/games/light_my_ritual/resources/textures/back_title.png
+++ b/games/light_my_ritual/resources/textures/back_title.png
diff --git a/games/light_my_ritual/resources/textures/background.png b/games/light_my_ritual/resources/textures/background.png
index 367bdd30..78dd3e21 100644
--- a/games/light_my_ritual/resources/textures/background.png
+++ b/games/light_my_ritual/resources/textures/background.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_i_off.png b/games/light_my_ritual/resources/textures/circle_level_i_off.png
index 7961af7d..4fe96618 100644
--- a/games/light_my_ritual/resources/textures/circle_level_i_off.png
+++ b/games/light_my_ritual/resources/textures/circle_level_i_off.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_i_on.png b/games/light_my_ritual/resources/textures/circle_level_i_on.png
index 1f217734..3ac21705 100644
--- a/games/light_my_ritual/resources/textures/circle_level_i_on.png
+++ b/games/light_my_ritual/resources/textures/circle_level_i_on.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_ii_off.png b/games/light_my_ritual/resources/textures/circle_level_ii_off.png
index 642adc3b..d97b7df1 100644
--- a/games/light_my_ritual/resources/textures/circle_level_ii_off.png
+++ b/games/light_my_ritual/resources/textures/circle_level_ii_off.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_ii_on.png b/games/light_my_ritual/resources/textures/circle_level_ii_on.png
index 93b71b3a..c4a1d710 100644
--- a/games/light_my_ritual/resources/textures/circle_level_ii_on.png
+++ b/games/light_my_ritual/resources/textures/circle_level_ii_on.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_iii_off.png b/games/light_my_ritual/resources/textures/circle_level_iii_off.png
index daf50be9..fe92c4f9 100644
--- a/games/light_my_ritual/resources/textures/circle_level_iii_off.png
+++ b/games/light_my_ritual/resources/textures/circle_level_iii_off.png
diff --git a/games/light_my_ritual/resources/textures/circle_level_iii_on.png b/games/light_my_ritual/resources/textures/circle_level_iii_on.png
index e2256e95..2c986595 100644
--- a/games/light_my_ritual/resources/textures/circle_level_iii_on.png
+++ b/games/light_my_ritual/resources/textures/circle_level_iii_on.png
diff --git a/games/light_my_ritual/resources/textures/enemy.png b/games/light_my_ritual/resources/textures/enemy.png
index dc0a911d..7f51ab59 100644
--- a/games/light_my_ritual/resources/textures/enemy.png
+++ b/games/light_my_ritual/resources/textures/enemy.png
diff --git a/games/light_my_ritual/resources/textures/foreground_level_i.png b/games/light_my_ritual/resources/textures/foreground_level_i.png
index 32b96740..58a5797a 100644
--- a/games/light_my_ritual/resources/textures/foreground_level_i.png
+++ b/games/light_my_ritual/resources/textures/foreground_level_i.png
diff --git a/games/light_my_ritual/resources/textures/foreground_level_ii.png b/games/light_my_ritual/resources/textures/foreground_level_ii.png
index 44f26003..b9e30648 100644
--- a/games/light_my_ritual/resources/textures/foreground_level_ii.png
+++ b/games/light_my_ritual/resources/textures/foreground_level_ii.png
diff --git a/games/light_my_ritual/resources/textures/foreground_level_iii.png b/games/light_my_ritual/resources/textures/foreground_level_iii.png
index 0fc039d7..054aa8dc 100644
--- a/games/light_my_ritual/resources/textures/foreground_level_iii.png
+++ b/games/light_my_ritual/resources/textures/foreground_level_iii.png
diff --git a/games/light_my_ritual/resources/textures/light.png b/games/light_my_ritual/resources/textures/light.png
index 5d08326f..98829c76 100644
--- a/games/light_my_ritual/resources/textures/light.png
+++ b/games/light_my_ritual/resources/textures/light.png
diff --git a/games/light_my_ritual/resources/textures/light_glow.png b/games/light_my_ritual/resources/textures/light_glow.png
index d31356c6..a0bc845b 100644
--- a/games/light_my_ritual/resources/textures/light_glow.png
+++ b/games/light_my_ritual/resources/textures/light_glow.png
diff --git a/games/light_my_ritual/resources/textures/light_ray.png b/games/light_my_ritual/resources/textures/light_ray.png
index f9f877fa..68c9e766 100644
--- a/games/light_my_ritual/resources/textures/light_ray.png
+++ b/games/light_my_ritual/resources/textures/light_ray.png
diff --git a/games/light_my_ritual/resources/textures/msg_ritual.png b/games/light_my_ritual/resources/textures/msg_ritual.png
index 73f14d48..fa256cc7 100644
--- a/games/light_my_ritual/resources/textures/msg_ritual.png
+++ b/games/light_my_ritual/resources/textures/msg_ritual.png
diff --git a/games/light_my_ritual/resources/textures/player.png b/games/light_my_ritual/resources/textures/player.png
index d6849478..637f1a25 100644
--- a/games/light_my_ritual/resources/textures/player.png
+++ b/games/light_my_ritual/resources/textures/player.png
diff --git a/games/light_my_ritual/resources/textures/time_over.png b/games/light_my_ritual/resources/textures/time_over.png
index 9f7935be..971334ab 100644
--- a/games/light_my_ritual/resources/textures/time_over.png
+++ b/games/light_my_ritual/resources/textures/time_over.png
diff --git a/games/light_my_ritual/resources/textures/title.png b/games/light_my_ritual/resources/textures/title.png
index 55eb593d..a1a0c86e 100644
--- a/games/light_my_ritual/resources/textures/title.png
+++ b/games/light_my_ritual/resources/textures/title.png
diff --git a/games/skully_escape/resources/textures/background_aisle01.png b/games/skully_escape/resources/textures/background_aisle01.png
index 482056f8..32fe5b69 100644
--- a/games/skully_escape/resources/textures/background_aisle01.png
+++ b/games/skully_escape/resources/textures/background_aisle01.png
diff --git a/games/skully_escape/resources/textures/doors.png b/games/skully_escape/resources/textures/doors.png
index f5a75d05..ff33169d 100644
--- a/games/skully_escape/resources/textures/doors.png
+++ b/games/skully_escape/resources/textures/doors.png
diff --git a/games/skully_escape/resources/textures/monster_chair_left.png b/games/skully_escape/resources/textures/monster_chair_left.png
index b3ac070f..a4774032 100644
--- a/games/skully_escape/resources/textures/monster_chair_left.png
+++ b/games/skully_escape/resources/textures/monster_chair_left.png
diff --git a/games/skully_escape/resources/textures/monster_chair_right.png b/games/skully_escape/resources/textures/monster_chair_right.png
index d29cc021..8d3007a3 100644
--- a/games/skully_escape/resources/textures/monster_chair_right.png
+++ b/games/skully_escape/resources/textures/monster_chair_right.png
diff --git a/games/skully_escape/resources/textures/monster_lamp_left.png b/games/skully_escape/resources/textures/monster_lamp_left.png
index 3b31b77f..d95dd248 100644
--- a/games/skully_escape/resources/textures/monster_lamp_left.png
+++ b/games/skully_escape/resources/textures/monster_lamp_left.png
diff --git a/games/skully_escape/resources/textures/monster_lamp_right.png b/games/skully_escape/resources/textures/monster_lamp_right.png
index 26491866..81bbc6d6 100644
--- a/games/skully_escape/resources/textures/monster_lamp_right.png
+++ b/games/skully_escape/resources/textures/monster_lamp_right.png
diff --git a/games/skully_escape/resources/textures/monster_picture.png b/games/skully_escape/resources/textures/monster_picture.png
index 29549895..f4f9d84b 100644
--- a/games/skully_escape/resources/textures/monster_picture.png
+++ b/games/skully_escape/resources/textures/monster_picture.png
diff --git a/games/skully_escape/resources/textures/monster_window.png b/games/skully_escape/resources/textures/monster_window.png
index 47d70a79..4a20a5c6 100644
--- a/games/skully_escape/resources/textures/monster_window.png
+++ b/games/skully_escape/resources/textures/monster_window.png
diff --git a/games/skully_escape/resources/textures/skully.png b/games/skully_escape/resources/textures/skully.png
index 9ce6cd58..5fec5939 100644
--- a/games/skully_escape/resources/textures/skully.png
+++ b/games/skully_escape/resources/textures/skully.png
diff --git a/games/transmission/resources/textures/ending_background.png b/games/transmission/resources/textures/ending_background.png
index 6577be63..20888658 100644
--- a/games/transmission/resources/textures/ending_background.png
+++ b/games/transmission/resources/textures/ending_background.png
diff --git a/games/transmission/resources/textures/message_background.png b/games/transmission/resources/textures/message_background.png
index 78c00a59..fb544796 100644
--- a/games/transmission/resources/textures/message_background.png
+++ b/games/transmission/resources/textures/message_background.png
diff --git a/games/transmission/resources/textures/message_vignette.png b/games/transmission/resources/textures/message_vignette.png
index 72234c59..6ef64b6b 100644
--- a/games/transmission/resources/textures/message_vignette.png
+++ b/games/transmission/resources/textures/message_vignette.png
diff --git a/games/transmission/resources/textures/mission_background.png b/games/transmission/resources/textures/mission_background.png
index 4efe5815..da5f3f67 100644
--- a/games/transmission/resources/textures/mission_background.png
+++ b/games/transmission/resources/textures/mission_background.png
diff --git a/games/transmission/resources/textures/mission_backline.png b/games/transmission/resources/textures/mission_backline.png
index 2a89d80a..6123a984 100644
--- a/games/transmission/resources/textures/mission_backline.png
+++ b/games/transmission/resources/textures/mission_backline.png
diff --git a/games/transmission/resources/textures/title_background.png b/games/transmission/resources/textures/title_background.png
index c90d880d..e45bbec8 100644
--- a/games/transmission/resources/textures/title_background.png
+++ b/games/transmission/resources/textures/title_background.png
diff --git a/games/transmission/resources/textures/title_ribbon.png b/games/transmission/resources/textures/title_ribbon.png
index 1526eba1..f75438dd 100644
--- a/games/transmission/resources/textures/title_ribbon.png
+++ b/games/transmission/resources/textures/title_ribbon.png
diff --git a/games/transmission/resources/textures/words_base.png b/games/transmission/resources/textures/words_base.png
index a2139030..e79e9815 100644
--- a/games/transmission/resources/textures/words_base.png
+++ b/games/transmission/resources/textures/words_base.png
diff --git a/games/transmission/screens/screen_ending.c b/games/transmission/screens/screen_ending.c
index 0aba5f01..d0cf7d89 100644
--- a/games/transmission/screens/screen_ending.c
+++ b/games/transmission/screens/screen_ending.c
@@ -110,10 +110,12 @@ void InitEndingScreen(void)
         {
             // WARNING: It fails if the last sentence word has a '.' after space
             char *title = StringReplace(headline, messageWords[i].text, codingWords[messageWords[i].id]);
-            
-            strcpy(headline, title);     // Base headline updated
-            
-            if (title != NULL) free(title);
+           
+            if (title != NULL)
+            {
+                strcpy(headline, title);     // Base headline updated
+                free(title);
+            }
         }
     }
     
diff --git a/games/wave_collector/resources/textures/background.png b/games/wave_collector/resources/textures/background.png
index f8613f82..b4f767f7 100644
--- a/games/wave_collector/resources/textures/background.png
+++ b/games/wave_collector/resources/textures/background.png
diff --git a/games/wave_collector/resources/textures/background_gameplay.png b/games/wave_collector/resources/textures/background_gameplay.png
index c6a51070..9be7d17d 100644
--- a/games/wave_collector/resources/textures/background_gameplay.png
+++ b/games/wave_collector/resources/textures/background_gameplay.png
diff --git a/games/wave_collector/resources/textures/background_title.png b/games/wave_collector/resources/textures/background_title.png
index 01fc46d3..19546d86 100644
--- a/games/wave_collector/resources/textures/background_title.png
+++ b/games/wave_collector/resources/textures/background_title.png
diff --git a/games/wave_collector/resources/textures/icon_synchro.png b/games/wave_collector/resources/textures/icon_synchro.png
index b7172823..841f826b 100644
--- a/games/wave_collector/resources/textures/icon_synchro.png
+++ b/games/wave_collector/resources/textures/icon_synchro.png
diff --git a/games/wave_collector/resources/textures/icon_warp.png b/games/wave_collector/resources/textures/icon_warp.png
index 2a5eb7bb..e91f43d4 100644
--- a/games/wave_collector/resources/textures/icon_warp.png
+++ b/games/wave_collector/resources/textures/icon_warp.png
diff --git a/games/wave_collector/resources/textures/lose.png b/games/wave_collector/resources/textures/lose.png
index f01c0284..ba69a4c2 100644
--- a/games/wave_collector/resources/textures/lose.png
+++ b/games/wave_collector/resources/textures/lose.png
diff --git a/games/wave_collector/resources/textures/player.png b/games/wave_collector/resources/textures/player.png
index c8913a8f..86b843b2 100644
--- a/games/wave_collector/resources/textures/player.png
+++ b/games/wave_collector/resources/textures/player.png
diff --git a/games/wave_collector/resources/textures/sample_big.png b/games/wave_collector/resources/textures/sample_big.png
index b4c4be97..6fb20b63 100644
--- a/games/wave_collector/resources/textures/sample_big.png
+++ b/games/wave_collector/resources/textures/sample_big.png
diff --git a/games/wave_collector/resources/textures/sample_small.png b/games/wave_collector/resources/textures/sample_small.png
index 7b624f7f..5fa7d01b 100644
--- a/games/wave_collector/resources/textures/sample_small.png
+++ b/games/wave_collector/resources/textures/sample_small.png
diff --git a/games/wave_collector/resources/textures/win.png b/games/wave_collector/resources/textures/win.png
index d7afdc25..7d539f66 100644
--- a/games/wave_collector/resources/textures/win.png
+++ b/games/wave_collector/resources/textures/win.png