projects
/
xonotic
/
darkplaces.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c0539f
)
fix unsigned vs. signed comparison warnings
author
eihrul <eihrul@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 1 Feb 2010 06:29:40 +0000
(06:29 +0000)
committer
eihrul <eihrul@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 1 Feb 2010 06:29:40 +0000
(06:29 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9912
d7cf8633
-e32d-0410-b094-
e92efae38249
snd_mix.c
patch
|
blob
|
history
diff --git
a/snd_mix.c
b/snd_mix.c
index 30e5a523e3f4749ba46d2d50f0c2236f89efadfe..79e6e0738803091e83f3ad084e286bc46c5fcb6f 100644
(file)
--- a/
snd_mix.c
+++ b/
snd_mix.c
@@
-482,16
+482,16
@@
void S_MixToBuffer(void *stream, unsigned int bufferframes)
if (ch->pos < 0)
{
count = -ch->pos;
- count = min(count, frames - ltime);
+ count = min(count,
(int)
frames - ltime);
ch->pos += count;
ltime += count;
}
- while (ltime < frames)
+ while (ltime <
(int)
frames)
{
// paint up to end of buffer or of input, whichever is lower
count = sfx->total_length - ch->pos;
- count = bound(0, count, frames - ltime);
+ count = bound(0, count,
(int)
frames - ltime);
if (count)
{
SND_PaintChannel (ch, paintbuffer + ltime, count);