removed obsolete FS_Close call in LoadGame

fixed two int -> unsigned char conversion warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4964 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index 808cee381320d591328f83444f90ca3b94e83838..995e61bc203ee72f5291cd41c1cf0035426d2a70 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -542,7 +542,6 @@ Host_Loadgame_f
 */
 void Host_Loadgame_f (void)
 {
-       qfile_t *f;
        char filename[MAX_QPATH];
        char mapname[MAX_QPATH];
        float time;
@@ -685,8 +684,6 @@ void Host_Loadgame_f (void)
        sv.num_edicts = entnum;
        sv.time = time;
 
-       FS_Close (f);
-
        for (i = 0;i < NUM_SPAWN_PARMS;i++)
                svs.clients[0].spawn_parms[i] = spawn_parms[i];
 

diff --git a/pr_cmds.c b/pr_cmds.c
index f1e4cbfd991ff535d71f0dc7484db02080a9940b..2d37e2266a3ef56d6437f41b4c15241d8b9a29e7 100644 (file)
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -2879,7 +2879,7 @@ void PF_fgets(void)
        {
                c = FS_Getc(pr_files[filenum]);
                if (c != '\n')
-                       FS_UnGetc(pr_files[filenum], c);
+                       FS_UnGetc(pr_files[filenum], (unsigned char)c);
        }
        if (developer.integer)
                Con_Printf("fgets: %s\n", string);

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 39d7573c8b64ed37a9aadf10cc88936e37e4c359..1d0a3d4cafe61905f0ff42cc1a9abb46b2dcfdee 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -1856,7 +1856,7 @@ void VM_fgets(void)
        {
                c = FS_Getc(VM_FILES[filenum]);
                if (c != '\n')
-                       FS_UnGetc(VM_FILES[filenum], c);
+                       FS_UnGetc(VM_FILES[filenum], (unsigned char)c);
        }
        if (developer.integer >= 3)
                Con_Printf("fgets: %s: %s\n", PRVM_NAME, string);