qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-22 03:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

svgalib input works again.

Browse source
This commit is contained in:
Joseph Carter 2000-02-14 03:27:10 +00:00
parent 6bd0f67f8c
commit fdd6112d74
5 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AUTHORS
View file

@ -52,6 +52,7 @@ E: knghtbrd@debian.org
D: QW/Q1 tree merging D: QW/Q1 tree merging
D: Autoconf support and portability D: Autoconf support and portability
D: Documentation D: Documentation
D: Driver module support/design
N: Peter Andreasen N: Peter Andreasen
E: pandr@pandr.dk E: pandr@pandr.dk
@ -124,6 +125,7 @@ D: Help with the speed cheat fix
N: Dan Olson N: Dan Olson
E: theoddone@quakefiles.com E: theoddone@quakefiles.com
D: Misc. code fixes D: Misc. code fixes
D: Driver modules
N: Mads Bondo Dydensborg N: Mads Bondo Dydensborg
E: madsdyd@challenge.dk E: madsdyd@challenge.dk

7
CREDITS
View file

@ -119,3 +119,10 @@ Network code fixes/cleanups:
IPv6 support (not complete): IPv6 support (not complete):
Pontus Lidman <pontus@lysator.liu.se> Pontus Lidman <pontus@lysator.liu.se>
Driver modules:
Zephaniah E. Hull <warp@whitestar.soark.net>
Bill Currie <bill@taniwha.org>
Joseph Carter <knghtbrd@debian.org>
Dan Olson <theoddone@quakefiles.com>

12
common/host.c
View file

@ -60,6 +60,7 @@ jmp_buf host_abort;
double realtime; // without any filtering or bounding double realtime; // without any filtering or bounding
double oldrealtime; // last frame run double oldrealtime; // last frame run
qboolean isDedicated; qboolean isDedicated;
qboolean vid_initialized;
int fps_count; int fps_count;
int vcrFile = -1; int vcrFile = -1;
double host_time; double host_time;
@ -582,6 +583,10 @@ Host_Init ( quakeparms_t *parms)
// IN->Init(); // IN->Init();
// Not the best place to load the plugin... // Not the best place to load the plugin...
VID_Init(host_basepal); VID_Init(host_basepal);
// DDOI - I made this so host.c wouldn't try to unload a plugin
// that it hasn't loaded. Could be done better I'm sure.
vid_initialized = true;
Draw_Init(); Draw_Init();
SCR_Init(); SCR_Init();
R_Init(); R_Init();
@ -642,8 +647,11 @@ Host_Shutdown( void )
CDAudio_Shutdown (); CDAudio_Shutdown ();
NET_Shutdown (); NET_Shutdown ();
S_Shutdown(); S_Shutdown();
IN->Shutdown(); // Don't unload what hasn't been loaded!
plugin_unload(IN->handle); if (vid_initialized == true) {
IN->Shutdown();
plugin_unload(IN->handle);
}
#if QUAKEWORLD #if QUAKEWORLD
if (host_basepal) { if (host_basepal) {

2
common/quakefs.h
View file

@ -37,7 +37,7 @@ struct cache_user_s;
extern char com_gamedir[MAX_OSPATH]; extern char com_gamedir[MAX_OSPATH];
void COM_WriteFile (char *filename, void *data, int len); void COM_WriteFile (char *filename, void *data, int len);
int COM_FOpenFile (char *filename, QFile **file); int COM_FOpenFile (char *filename, QFile **gzfile);
void COM_CloseFile (QFile *h); void COM_CloseFile (QFile *h);
byte *COM_LoadStackFile (char *path, void *buffer, int bufsize); byte *COM_LoadStackFile (char *path, void *buffer, int bufsize);

3
common/vid_svgalib.c
View file

@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <cmd.h> #include <cmd.h>
#include <sys.h> #include <sys.h>
#include <console.h> #include <console.h>
#include <plugin.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
@ -491,6 +492,8 @@ VID_Init(unsigned char *palette)
int w, h, d; int w, h, d;
int err; int err;
plugin_load("./in_svgalib.so");
IN->Init();
/* Sound gets initialized here */ /* Sound gets initialized here */
S_Init(); S_Init();