diff options
| author | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-01 07:51:23 +0000 |
|---|---|---|
| committer | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-01 07:51:23 +0000 |
| commit | 10afaeef337e0d19b37cb7dbe3fccee48bf18a43 (patch) | |
| tree | 365da78a39bf90a8321da9f9bbf554ff5733eae6 /code/client/cl_cin.c | |
| parent | 94017ca419caff91bf26841b503b5867d992ca4c (diff) | |
| download | ioquake3-aero-10afaeef337e0d19b37cb7dbe3fccee48bf18a43.tar.gz ioquake3-aero-10afaeef337e0d19b37cb7dbe3fccee48bf18a43.zip | |
Initial patch for in-game VoIP support!
git-svn-id: svn://svn.icculus.org/quake3/trunk@1348 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client/cl_cin.c')
| -rw-r--r-- | code/client/cl_cin.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c index 0e44eee..bb5be7e 100644 --- a/code/client/cl_cin.c +++ b/code/client/cl_cin.c @@ -53,8 +53,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define MAX_VIDEO_HANDLES 16 extern glconfig_t glConfig; -extern int s_paintedtime; -extern int s_rawend; static void RoQ_init( void ); @@ -1141,17 +1139,17 @@ redump: case ZA_SOUND_MONO: if (!cinTable[currentHandle].silent) { ssize = RllDecodeMonoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags); - S_RawSamples( ssize, 22050, 2, 1, (byte *)sbuf, 1.0f ); + S_RawSamples( 0, ssize, 22050, 2, 1, (byte *)sbuf, 1.0f ); } break; case ZA_SOUND_STEREO: if (!cinTable[currentHandle].silent) { if (cinTable[currentHandle].numQuads == -1) { S_Update(); - s_rawend = s_soundtime; + s_rawend[0] = s_soundtime; } ssize = RllDecodeStereoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags); - S_RawSamples( ssize, 22050, 2, 2, (byte *)sbuf, 1.0f ); + S_RawSamples( 0, ssize, 22050, 2, 2, (byte *)sbuf, 1.0f ); } break; case ROQ_QUAD_INFO: @@ -1478,7 +1476,7 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi Con_Close(); - s_rawend = s_soundtime; + s_rawend[0] = s_soundtime; return currentHandle; } |