aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2016-01-23 13:22:13 +0100
committerraysan5 <raysan5@gmail.com>2016-01-23 13:22:13 +0100
commit08da91047e8a2c593c3bc40b31c4796ae6cbb26d (patch)
tree5b18e088ad489e5232774b5f688815720a0bada4 /src
parent6e9d3eb0f99c8ce00b769dbd03cc011216b97068 (diff)
downloadraylib-08da91047e8a2c593c3bc40b31c4796ae6cbb26d.tar.gz
raylib-08da91047e8a2c593c3bc40b31c4796ae6cbb26d.zip
Some code tweaks
Diffstat (limited to 'src')
-rw-r--r--src/audio.c17
-rw-r--r--src/core.c2
-rw-r--r--src/models.c2
-rw-r--r--src/raylib.h2
-rw-r--r--src/shapes.c4
5 files changed, 11 insertions, 16 deletions
diff --git a/src/audio.c b/src/audio.c
index 6313c9dc..e40fdd41 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -166,15 +166,8 @@ void CloseAudioDevice(void)
// Load sound to memory
Sound LoadSound(char *fileName)
{
- Sound sound;
- Wave wave;
-
- // Init some default values for wave...
- wave.data = NULL;
- wave.dataSize = 0;
- wave.sampleRate = 0;
- wave.bitsPerSample = 0;
- wave.channels = 0;
+ Sound sound = { 0 };
+ Wave wave = { 0 };
// NOTE: The entire file is loaded to memory to play it all at once (no-streaming)
@@ -236,7 +229,7 @@ Sound LoadSound(char *fileName)
// Load sound from wave data
Sound LoadSoundFromWave(Wave wave)
{
- Sound sound;
+ Sound sound = { 0 };
if (wave.data != NULL)
{
@@ -290,7 +283,7 @@ Sound LoadSoundFromWave(Wave wave)
Sound LoadSoundFromRES(const char *rresName, int resId)
{
// NOTE: rresName could be directly a char array with all the data!!! --> TODO
- Sound sound;
+ Sound sound = { 0 };
#if defined(AUDIO_STANDALONE)
TraceLog(WARNING, "Sound loading from rRES resource file not supported on standalone mode");
@@ -791,7 +784,7 @@ static Wave LoadWAV(const char *fileName)
WaveFormat waveFormat;
WaveData waveData;
- Wave wave;
+ Wave wave = { 0 };
FILE *wavFile;
wavFile = fopen(fileName, "rb");
diff --git a/src/core.c b/src/core.c
index 9b068300..7a5de04e 100644
--- a/src/core.c
+++ b/src/core.c
@@ -1230,7 +1230,9 @@ Vector2 GetTouchPosition(void)
return position;
}
+#endif
+#if defined(PLATFORM_ANDROID)
// Detect if a button has been pressed once
bool IsButtonPressed(int button)
{
diff --git a/src/models.c b/src/models.c
index 80d9a13a..e90f455a 100644
--- a/src/models.c
+++ b/src/models.c
@@ -557,7 +557,7 @@ void DrawGizmo(Vector3 position)
// Load a 3d model (from file)
Model LoadModel(const char *fileName)
{
- Model model;
+ Model model = { 0 };
Mesh mesh = { 0 };
// NOTE: Initialize default data for model in case loading fails, maybe a cube?
diff --git a/src/raylib.h b/src/raylib.h
index 49a320d4..73200556 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -18,7 +18,7 @@
*
* Used external libs:
* GLFW3 (www.glfw.org) for window/context management and input
-* GLAD for OpenGL extensions loading (3.3 Core profile)
+* GLAD for OpenGL extensions loading (3.3 Core profile, only PLATFORM_DESKTOP)
* stb_image (Sean Barret) for images loading (JPEG, PNG, BMP, TGA, PSD, GIF, HDR, PIC)
* stb_image_write (Sean Barret) for image writting (PNG)
* stb_vorbis (Sean Barret) for ogg audio loading
diff --git a/src/shapes.c b/src/shapes.c
index a4761536..3b4be071 100644
--- a/src/shapes.c
+++ b/src/shapes.c
@@ -397,8 +397,8 @@ bool CheckCollisionCircleRec(Vector2 center, float radius, Rectangle rec)
int recCenterX = rec.x + rec.width/2;
int recCenterY = rec.y + rec.height/2;
- float dx = abs(center.x - recCenterX);
- float dy = abs(center.y - recCenterY);
+ float dx = fabs(center.x - recCenterX);
+ float dy = fabs(center.y - recCenterY);
if (dx > (rec.width/2 + radius)) { return false; }
if (dy > (rec.height/2 + radius)) { return false; }