yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary fileHandle_t typecasts

This commit is contained in:
svdijk 2013-05-13 18:49:16 +02:00
parent b08fbb7cbf
commit 4bef586e67
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/client/cl_cin.c
View File

@ -174,7 +174,7 @@ SCR_StopCinematic(void)
if (cl.cinematic_file) if (cl.cinematic_file)
{ {
FS_FCloseFile((fileHandle_t)cl.cinematic_file); FS_FCloseFile(cl.cinematic_file);
cl.cinematic_file = 0; cl.cinematic_file = 0;
} }
@ -258,7 +258,7 @@ Huff1TableInit(void)
memset(cin.h_used, 0, sizeof(cin.h_used)); memset(cin.h_used, 0, sizeof(cin.h_used));
/* read a row of counts */ /* read a row of counts */
FS_Read(counts, sizeof(counts), (fileHandle_t)cl.cinematic_file); FS_Read(counts, sizeof(counts), cl.cinematic_file);
for (j = 0; j < 256; j++) for (j = 0; j < 256; j++)
{ {
@ -369,12 +369,12 @@ SCR_ReadNextFrame(void)
int start, end, count; int start, end, count;
/* read the next frame */ /* read the next frame */
r = FS_FRead(&command, 4, 1, (fileHandle_t)cl.cinematic_file); r = FS_FRead(&command, 4, 1, cl.cinematic_file);
if (r == 0) if (r == 0)
{ {
/* we'll give it one more chance */ /* we'll give it one more chance */
r = FS_FRead(&command, 4, 1, (fileHandle_t)cl.cinematic_file); r = FS_FRead(&command, 4, 1, cl.cinematic_file);
} }
if (r != 4) if (r != 4)
@ -393,12 +393,12 @@ SCR_ReadNextFrame(void)
{ {
/* read palette */ /* read palette */
FS_Read(cl.cinematicpalette, sizeof(cl.cinematicpalette), FS_Read(cl.cinematicpalette, sizeof(cl.cinematicpalette),
(fileHandle_t)cl.cinematic_file); cl.cinematic_file);
cl.cinematicpalette_active = 0; cl.cinematicpalette_active = 0;
} }
/* decompress the next frame */ /* decompress the next frame */
FS_Read(&size, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&size, 4, cl.cinematic_file);
size = LittleLong(size); size = LittleLong(size);
if (((unsigned long)size > sizeof(compressed)) || (size < 1)) if (((unsigned long)size > sizeof(compressed)) || (size < 1))
@ -406,7 +406,7 @@ SCR_ReadNextFrame(void)
Com_Error(ERR_DROP, "Bad compressed frame size"); Com_Error(ERR_DROP, "Bad compressed frame size");
} }
FS_Read(compressed, size, (fileHandle_t)cl.cinematic_file); FS_Read(compressed, size, cl.cinematic_file);
/* read sound */ /* read sound */
start = cl.cinematicframe * cin.s_rate / 14; start = cl.cinematicframe * cin.s_rate / 14;
@ -414,7 +414,7 @@ SCR_ReadNextFrame(void)
count = end - start; count = end - start;
FS_Read(samples, count * cin.s_width * cin.s_channels, FS_Read(samples, count * cin.s_width * cin.s_channels,
(fileHandle_t)cl.cinematic_file); cl.cinematic_file);
if (cin.s_width == 2) if (cin.s_width == 2)
{ {
@ -612,7 +612,7 @@ SCR_PlayCinematic(char *arg)
} }
Com_sprintf(name, sizeof(name), "video/%s", arg); Com_sprintf(name, sizeof(name), "video/%s", arg);
FS_FOpenFile(name, (fileHandle_t *)&cl.cinematic_file, FS_READ); FS_FOpenFile(name, &cl.cinematic_file, FS_READ);
if (!cl.cinematic_file) if (!cl.cinematic_file)
{ {
@ -625,16 +625,16 @@ SCR_PlayCinematic(char *arg)
cls.state = ca_active; cls.state = ca_active;
FS_Read(&width, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&width, 4, cl.cinematic_file);
FS_Read(&height, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&height, 4, cl.cinematic_file);
cin.width = LittleLong(width); cin.width = LittleLong(width);
cin.height = LittleLong(height); cin.height = LittleLong(height);
FS_Read(&cin.s_rate, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&cin.s_rate, 4, cl.cinematic_file);
cin.s_rate = LittleLong(cin.s_rate); cin.s_rate = LittleLong(cin.s_rate);
FS_Read(&cin.s_width, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&cin.s_width, 4, cl.cinematic_file);
cin.s_width = LittleLong(cin.s_width); cin.s_width = LittleLong(cin.s_width);
FS_Read(&cin.s_channels, 4, (fileHandle_t)cl.cinematic_file); FS_Read(&cin.s_channels, 4, cl.cinematic_file);
cin.s_channels = LittleLong(cin.s_channels); cin.s_channels = LittleLong(cin.s_channels);
Huff1TableInit(); Huff1TableInit();

4
src/client/menu/menu.c
View File

@ -2214,8 +2214,8 @@ Create_Savestrings(void)
} }
else else
{ {
FS_Read(m_savestrings[i], sizeof(m_savestrings[i]), (fileHandle_t)f); FS_Read(m_savestrings[i], sizeof(m_savestrings[i]), f);
FS_FCloseFile((fileHandle_t)f); FS_FCloseFile(f);
m_savevalid[i] = true; m_savevalid[i] = true;
} }
} }