aboutsummaryrefslogtreecommitdiff
path: root/src/raylib.h
diff options
context:
space:
mode:
authorJoshua Reisenauer <kd7tck@msn.com>2016-05-03 14:17:37 -0700
committerJoshua Reisenauer <kd7tck@msn.com>2016-05-03 14:17:37 -0700
commite6607009248e8d17a607b12818581f9a28c40d26 (patch)
tree7661244e012dae5e2e92d28812acb873f7c11fa0 /src/raylib.h
parentd6feeb14ffc11e54a82f51dbbe899f720d6997e8 (diff)
parentfd67e31f630476980eb09e49177958703db5b3d3 (diff)
downloadraylib-e6607009248e8d17a607b12818581f9a28c40d26.tar.gz
raylib-e6607009248e8d17a607b12818581f9a28c40d26.zip
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
Diffstat (limited to 'src/raylib.h')
-rw-r--r--src/raylib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/raylib.h b/src/raylib.h
index c9ba5b38..63ab0a5c 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -586,7 +586,7 @@ void BeginTextureMode(RenderTexture2D target); // Initializes rende
void EndTextureMode(void); // Ends drawing to render texture
Ray GetMouseRay(Vector2 mousePosition, Camera camera); // Returns a ray trace from mouse position
-Vector2 WorldToScreen(Vector3 position, Camera camera); // Returns the screen space position from a 3d world space position
+Vector2 GetWorldToScreen(Vector3 position, Camera camera); // Returns the screen space position from a 3d world space position
Matrix GetCameraMatrix(Camera camera); // Returns camera transform matrix (view matrix)
void SetTargetFPS(int fps); // Set target FPS (maximum)
@@ -882,7 +882,7 @@ void UnloadSound(Sound sound); // Unload sound
void PlaySound(Sound sound); // Play a sound
void PauseSound(Sound sound); // Pause a sound
void StopSound(Sound sound); // Stop playing a sound
-bool SoundIsPlaying(Sound sound); // Check if a sound is currently playing
+bool IsSoundPlaying(Sound sound); // Check if a sound is currently playing
void SetSoundVolume(Sound sound, float volume); // Set volume for a sound (1.0 is max level)
void SetSoundPitch(Sound sound, float pitch); // Set pitch for a sound (1.0 is base level)
@@ -891,7 +891,7 @@ void UpdateMusicStream(void); // Updates buffe
void StopMusicStream(void); // Stop music playing (close stream)
void PauseMusicStream(void); // Pause music playing
void ResumeMusicStream(void); // Resume playing paused music
-bool MusicIsPlaying(void); // Check if music is playing
+bool IsMusicPlaying(void); // Check if music is playing
void SetMusicVolume(float volume); // Set volume for music (1.0 is max level)
float GetMusicTimeLength(void); // Get current music time length (in seconds)
float GetMusicTimePlayed(void); // Get current music time played (in seconds)