From 8bbe24a289c38c36977863f2736cb59b00fdcd7e Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Fri, 24 Mar 2000 14:43:43 +0000 Subject: [PATCH] All finished! --- common/sbar.c | 39 ++++++++++++++++++------------- common/sbar.h | 37 ++++++++++++++++++----------- common/screen.c | 39 ++++++++++++++++++------------- common/screen.h | 38 +++++++++++++++++------------- common/server.h | 37 +++++++++++++++++------------ common/skin.c | 54 ++++++++++++++++++++++++------------------- common/snd_alsa.c | 46 +++++++++++++++++++++--------------- common/snd_dma.c | 37 +++++++++++++++++------------ common/snd_dos.c | 40 +++++++++++++++++++------------- common/snd_gus.c | 41 ++++++++++++++++++++------------- common/snd_mem.c | 51 ++++++++++++++++++++++------------------ common/snd_mix.c | 47 +++++++++++++++++++++---------------- common/snd_mixa.s | 44 +++++++++++++++++++---------------- common/snd_mme.c | 42 ++++++++++++++++++++------------- common/snd_next.c | 39 +++++++++++++++++++------------ common/snd_null.c | 48 ++++++++++++++++++++------------------ common/snd_oss.c | 45 +++++++++++++++++++++--------------- common/snd_sun.c | 47 ++++++++++++++++++++++--------------- common/snd_win.c | 47 ++++++++++++++++++++----------------- common/sound.h | 37 +++++++++++++++++------------ common/spritegn.h | 51 ++++++++++++++++++++++------------------ common/surf16.s | 46 +++++++++++++++++++----------------- common/surf8.s | 46 +++++++++++++++++++----------------- common/sw_rpart.c | 44 ++++++++++++++++++++--------------- common/sw_view.c | 41 +++++++++++++++++++-------------- common/sys.h | 38 ++++++++++++++++++------------ common/sys_common.c | 39 +++++++++++++++++-------------- common/sys_dosa.s | 43 +++++++++++++++++++--------------- common/sys_linux.c | 13 +++++++---- common/sys_null.c | 42 ++++++++++++++++++--------------- common/uint32.h | 28 ++++++++++++---------- common/unzip.c | 34 +++++++++++++++++++++++---- common/unzip.h | 30 +++++++++++++++++++++--- common/vgamodes.h | 41 ++++++++++++++++++--------------- common/vid.h | 37 +++++++++++++++++------------ common/vid_aa.c | 38 ++++++++++++++++++------------ common/vid_dos.c | 49 +++++++++++++++++++++------------------ common/vid_ext.c | 48 ++++++++++++++++++++------------------ common/vid_ggi.c | 43 ++++++++++++++++++++-------------- common/vid_null.c | 37 +++++++++++++++++------------ common/vid_sdl.c | 38 +++++++++++++++++------------- common/vid_sunx.c | 42 ++++++++++++++++++--------------- common/vid_sunxil.c | 47 ++++++++++++++++++++----------------- common/vid_svgalib.c | 51 +++++++++++++++++++++------------------- common/vid_vga.c | 51 ++++++++++++++++++++++------------------ common/vid_win.c | 55 +++++++++++++++++++------------------------- common/vid_x11.c | 40 +++++++++++++++++++------------- common/view.c | 37 +++++++++++++++++------------ common/view.h | 36 +++++++++++++++++------------ 49 files changed, 1189 insertions(+), 851 deletions(-) diff --git a/common/sbar.c b/common/sbar.c index 070791d..7e3c4b1 100644 --- a/common/sbar.c +++ b/common/sbar.c @@ -1,25 +1,32 @@ /* -sbar.c - status bar code -Copyright (C) 1996-1997 Id Software, Inc. -Portions Copyright (C) 1999,2000 Nelson Rush. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sbar.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + status bar code -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 2000 Joseph Carter + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include diff --git a/common/sbar.h b/common/sbar.h index 28b55e5..270f85f 100644 --- a/common/sbar.h +++ b/common/sbar.h @@ -1,23 +1,31 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sbar.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Status bar interface -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ // the status bar is only redrawn if something has changed, but if anything @@ -39,3 +47,4 @@ void Sbar_IntermissionOverlay (void); // called each frame after the level has been completed void Sbar_FinaleOverlay (void); + diff --git a/common/screen.c b/common/screen.c index 4cfda09..90f9f3b 100644 --- a/common/screen.c +++ b/common/screen.c @@ -1,25 +1,32 @@ /* -screen.c - master for refresh, status bar, console, chat, notify, etc -Copyright (C) 1996-1997 Id Software, Inc. -Portions Copyright (C) 1999,2000 Nelson Rush. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + screen.c + + master for refresh, status bar, console, chat, notify, etc -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include diff --git a/common/screen.h b/common/screen.h index eda8613..19d233b 100644 --- a/common/screen.h +++ b/common/screen.h @@ -1,30 +1,36 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + screen.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #ifndef _SCREEN_H #define _SCREEN_H -// screen.h - void SCR_InitCvars (void); void SCR_Init (void); diff --git a/common/server.h b/common/server.h index e3e06a3..c6fec6f 100644 --- a/common/server.h +++ b/common/server.h @@ -1,24 +1,31 @@ /* -server.h -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + server.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #ifndef _SERVER_H diff --git a/common/skin.c b/common/skin.c index 8876be5..27fc6cd 100644 --- a/common/skin.c +++ b/common/skin.c @@ -1,37 +1,42 @@ /* -skin.c - player skins -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Portions Copyright (C) 1999,2000 Nelson Rush. -Please see the file "AUTHORS" for a list of contributors + skin.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + player skins -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "qtypes.h" -#include "quakedef.h" -#include "cvar.h" -#include "client.h" -#include "console.h" -#include "client.h" +#include +#include +#include +#include +#include +#include -//cvar_t baseskin = {"baseskin", "base"}; cvar_t *baseskin; -//cvar_t noskins = {"noskins", "0"}; cvar_t *noskins; char allskins[128]; @@ -233,3 +238,4 @@ void Skin_AllSkins_f (void) strcpy (allskins, Cmd_Argv(1)); Skin_Skins_f (); } + diff --git a/common/snd_alsa.c b/common/snd_alsa.c index f5cfbca..b8fc7d8 100644 --- a/common/snd_alsa.c +++ b/common/snd_alsa.c @@ -1,28 +1,37 @@ /* -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_alsa.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "config.h" -#include "qtypes.h" -#include "sound.h" -#include "qargs.h" -#include "console.h" + +#include +#include +#include +#include +#include #include #include @@ -307,3 +316,4 @@ void SNDDMA_Submit(void) break; } } + diff --git a/common/snd_dma.c b/common/snd_dma.c index 046a050..a7f3db8 100644 --- a/common/snd_dma.c +++ b/common/snd_dma.c @@ -1,24 +1,31 @@ /* -snd_dma.c - main control for any streaming sound output device -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_dma.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + main control for any streaming sound output device -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include diff --git a/common/snd_dos.c b/common/snd_dos.c index 548679e..daff4b4 100644 --- a/common/snd_dos.c +++ b/common/snd_dos.c @@ -1,27 +1,35 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_dos.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "quakedef.h" -#include "dosisms.h" +#include +#include int BLASTER_GetDMAPos(void); diff --git a/common/snd_gus.c b/common/snd_gus.c index 9e166f3..5ebba0e 100644 --- a/common/snd_gus.c +++ b/common/snd_gus.c @@ -1,32 +1,41 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_gus.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ + //============================================================================= // Routines for GUS support in QUAKE // // Author(s): Jayeson Lee-Steere //============================================================================= -#include "quakedef.h" -#include "dosisms.h" +#include +#include //============================================================================= // Author(s): Jayeson Lee-Steere diff --git a/common/snd_mem.c b/common/snd_mem.c index dbe9536..390c563 100644 --- a/common/snd_mem.c +++ b/common/snd_mem.c @@ -1,33 +1,40 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_mem.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + sound caching -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// snd_mem.c: sound caching -#include "qtypes.h" -#include "sound.h" -#include "qendian.h" -#include "lib_replace.h" -#include "string.h" -#include "quakefs.h" -#include "sys.h" +#include +#include +#include +#include +#include +#include +#include #include int cache_full_cycle; diff --git a/common/snd_mix.c b/common/snd_mix.c index 0ac3369..6a5663e 100644 --- a/common/snd_mix.c +++ b/common/snd_mix.c @@ -1,33 +1,40 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_mix.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + portable code to mix sounds for snd_dma.c -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// snd_mix.c -- portable code to mix sounds for snd_dma.c -#include "config.h" -#include "qtypes.h" -#include "sound.h" -#include "lib_replace.h" +#include +#include +#include +#include #ifdef _WIN32 -#include "winquake.h" +#include #else #define DWORD unsigned long #endif diff --git a/common/snd_mixa.s b/common/snd_mixa.s index 2695813..e54b6ad 100644 --- a/common/snd_mixa.s +++ b/common/snd_mixa.s @@ -1,31 +1,35 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_mixa.s -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + x86 assembly-language sound code -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// snd_mixa.s -// x86 assembly-language sound code -// -#include "asm_i386.h" -#include "quakeasm.h" +#include +#include #if id386 diff --git a/common/snd_mme.c b/common/snd_mme.c index 1acf4c3..b6d5270 100644 --- a/common/snd_mme.c +++ b/common/snd_mme.c @@ -1,27 +1,37 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se] + snd_mme.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se] + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "common_quakedef.h" -#include "console.h" -#include "sound.h" +#include +#include +#include #include #ifdef HAVE_MME_MME_PUBLIC_H # include diff --git a/common/snd_next.c b/common/snd_next.c index 9754818..d76793d 100644 --- a/common/snd_next.c +++ b/common/snd_next.c @@ -1,26 +1,34 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_next.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "quakedef.h" +#include extern int desired_speed; extern int desired_bits; @@ -55,3 +63,4 @@ int SNDDMA_GetDMAPos(void) void SNDDMA_Shutdown(void) { } + diff --git a/common/snd_null.c b/common/snd_null.c index f5754eb..101cb92 100644 --- a/common/snd_null.c +++ b/common/snd_null.c @@ -1,31 +1,36 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_null.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + include this instead of all the other snd_* files to have no sound + code whatsoever -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// snd_null.c -- include this instead of all the other snd_* files to have -// no sound code whatsoever -//#include "config.h" -//#include "common_quakedef.h" -#include "qtypes.h" -#include "sound.h" +#include +#include // ======================================================================= // Various variables also defined in snd_dma.c @@ -34,14 +39,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. channel_t channels[MAX_CHANNELS]; int total_channels; volatile dma_t *shm = 0; -//cvar_t loadas8bit = {"loadas8bit", "0"}; cvar_t *loadas8bit; int paintedtime; // sample PAIRS -//cvar_t bgmvolume = {"bgmvolume", "1", true}; cvar_t *bgmvolume; -//cvar_t volume = {"volume", "0.7", true}; cvar_t *volume; diff --git a/common/snd_oss.c b/common/snd_oss.c index 54116ff..8b14065 100644 --- a/common/snd_oss.c +++ b/common/snd_oss.c @@ -1,28 +1,37 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_oss.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "config.h" -#include "qtypes.h" -#include "sound.h" -#include "qargs.h" + +#include +#include +#include +#include #include #include diff --git a/common/snd_sun.c b/common/snd_sun.c index 4b5f5ea..3b6d21d 100644 --- a/common/snd_sun.c +++ b/common/snd_sun.c @@ -1,29 +1,38 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + snd_sun.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "config.h" -#include "qtypes.h" -#include "sound.h" -#include "qargs.h" -#include "console.h" + +#include +#include +#include +#include +#include #ifdef HAVE_UNISTD_H #include diff --git a/common/snd_win.c b/common/snd_win.c index 86f6f8c..9e237ea 100644 --- a/common/snd_win.c +++ b/common/snd_win.c @@ -1,35 +1,40 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License for more details. + See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "quakedef.h" -#include "winquake.h" + +#include +#include #ifdef HAVE_MMSYSTEM_H # include #endif -#include "config.h" -#include "qtypes.h" -#include "sound.h" -#include "qargs.h" -#include "console.h" +#include +#include +#include +#include +#include #include diff --git a/common/sound.h b/common/sound.h index d6ee797..8e38789 100644 --- a/common/sound.h +++ b/common/sound.h @@ -1,24 +1,31 @@ /* -sound.h - client sound i/o functions -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sound.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + client sound i/o functions -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #ifndef __SOUND__ diff --git a/common/spritegn.h b/common/spritegn.h index 5f0ae7d..7a3978e 100644 --- a/common/spritegn.h +++ b/common/spritegn.h @@ -1,27 +1,32 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + spritegn.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + header file for sprite generation program -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// spritegn.h: header file for sprite generation program -// // ********************************************************** // * This file must be identical in the spritegen directory * @@ -51,12 +56,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "cmdlib.h" -#include "scriplib.h" -#include "dictlib.h" -#include "trilib.h" -#include "lbmlib.h" -#include "mathlib.h" +#include +#include +#include +#include +#include +#include #endif diff --git a/common/surf16.s b/common/surf16.s index 867ea89..52246a6 100644 --- a/common/surf16.s +++ b/common/surf16.s @@ -1,32 +1,36 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + surf16.s -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + x86 assembly-language 16 bpp surface block drawing code. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// surf16.s -// x86 assembly-language 16 bpp surface block drawing code. -// -#include "asm_i386.h" -#include "quakeasm.h" -#include "asm_draw.h" +#include +#include +#include #if id386 diff --git a/common/surf8.s b/common/surf8.s index a9f727a..4dc9fc4 100644 --- a/common/surf8.s +++ b/common/surf8.s @@ -1,32 +1,36 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + surf8.s -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + x86 assembly-language 8 bpp surface block drawing code. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// surf8.s -// x86 assembly-language 8 bpp surface block drawing code. -// -#include "asm_i386.h" -#include "quakeasm.h" -#include "asm_draw.h" +#include +#include +#include #if id386 diff --git a/common/sw_rpart.c b/common/sw_rpart.c index 4932345..2ef73c2 100644 --- a/common/sw_rpart.c +++ b/common/sw_rpart.c @@ -1,30 +1,38 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Portions Copyright (C) 1999,2000 Nelson Rush. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sw_rpart.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + (description) -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "quakedef.h" -#include "r_local.h" +#include +#include -#include "d_iface.h" +#include #include extern particle_t *active_particles, *free_particles; diff --git a/common/sw_view.c b/common/sw_view.c index 8da3f8f..3ef40aa 100644 --- a/common/sw_view.c +++ b/common/sw_view.c @@ -1,28 +1,35 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sw_view.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + software renderer player eye positioning -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// view.c -- player eye positioning -#include "quakedef.h" -#include "r_local.h" +#include +#include #include #include diff --git a/common/sys.h b/common/sys.h index 1cb04e2..0037709 100644 --- a/common/sys.h +++ b/common/sys.h @@ -1,25 +1,32 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sys.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + non-portable functions -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// sys.h -- non-portable functions int Sys_FileTime (char *path); @@ -68,3 +75,4 @@ void Sys_HighFPPrecision (void); void Sys_SetFPCW (void); extern char trans_table[256]; + diff --git a/common/sys_common.c b/common/sys_common.c index 648ea68..5595700 100644 --- a/common/sys_common.c +++ b/common/sys_common.c @@ -1,30 +1,35 @@ /* + sys_common.c - sys_common.c - Common system routines. + Common system routines - Copyright (C) 1996-1997 Id Software, Inc. - Copyright (C) 1999-2000 contributors of the QuakeForge project - Portions Copyright (C) 1999,2000 Nelson Rush. - Please see the file "AUTHORS" for a list of contributors + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. + See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -#include "quakedef.h" +#include #include #include diff --git a/common/sys_dosa.s b/common/sys_dosa.s index 7b1dcc5..e3777f7 100644 --- a/common/sys_dosa.s +++ b/common/sys_dosa.s @@ -1,30 +1,35 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sys_dosa.s -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + x86 assembly-language DOS-dependent routines. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// sys_dosa.s -// x86 assembly-language DOS-dependent routines. -#include "asm_i386.h" -#include "quakeasm.h" +#include +#include .data diff --git a/common/sys_linux.c b/common/sys_linux.c index 769e2d0..f0c165b 100644 --- a/common/sys_linux.c +++ b/common/sys_linux.c @@ -4,8 +4,8 @@ Linux-style Unix system driver. Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. Copyright (C) 1999,2000 contributors of the QuakeForge project - Portions Copyright (C) 1999,2000 Nelson Rush. Please see the file "AUTHORS" for a list of contributors This program is free software; you can redistribute it and/or @@ -20,9 +20,13 @@ See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include @@ -355,3 +359,4 @@ void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length) { Sys_Error("Protection change failed\n"); } + diff --git a/common/sys_null.c b/common/sys_null.c index 9e8c59d..5f98753 100644 --- a/common/sys_null.c +++ b/common/sys_null.c @@ -1,28 +1,35 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + sys_null.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + null system driver to aid porting efforts -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// sys_null.h -- null system driver to aid porting efforts -#include "quakedef.h" -#include "errno.h" +#include +#include /* File I/O @@ -189,4 +196,3 @@ void main (int argc, char **argv) } } - diff --git a/common/uint32.h b/common/uint32.h index 50ff506..22a650d 100644 --- a/common/uint32.h +++ b/common/uint32.h @@ -9,21 +9,25 @@ Author: Jeff Teunissen Date: 01 Jan 2000 - This file is part of the QuakeForge utility library. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #ifndef _UINT32_H diff --git a/common/unzip.c b/common/unzip.c index 7752a31..e88f1a4 100644 --- a/common/unzip.c +++ b/common/unzip.c @@ -1,15 +1,39 @@ -/* unzip.c -- IO on .zip files using zlib - Version 0.15 beta, Mar 19th, 1998, +/* + unzip.c - Read unzip.h for more info + IO on .zip files using zlib + + Copyright (C) 1998 Gilles Vollant + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include #include #include -#include "zlib.h" -#include "unzip.h" +#include +#include #ifdef STDC # include diff --git a/common/unzip.h b/common/unzip.h index 3c8f896..230a073 100644 --- a/common/unzip.h +++ b/common/unzip.h @@ -1,7 +1,31 @@ -/* unzip.h -- IO for uncompress .zip files using zlib - Version 0.15 beta, Mar 19th, 1998, +/* + unzip.h - Copyright (C) 1998 Gilles Vollant + IO for uncompress .zip files using zlib + + Copyright (C) 1998 Gilles Vollant + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g WinZip, InfoZip tools and compatible. diff --git a/common/vgamodes.h b/common/vgamodes.h index e7aa8d4..f6e962d 100644 --- a/common/vgamodes.h +++ b/common/vgamodes.h @@ -1,29 +1,34 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vgamodes.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + VGA mode set tables -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// vgamodes.h: VGA mode set tables -// -#include "vregset.h" +#include int VGA_InitMode (viddef_t *vid, vmode_t *pcurrentmode); void VGA_SwapBuffers (viddef_t *vid, vmode_t *pcurrentmode, vrect_t *rects); diff --git a/common/vid.h b/common/vid.h index 2f5fb30..8266f64 100644 --- a/common/vid.h +++ b/common/vid.h @@ -1,25 +1,32 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + video driver defs -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// vid.h -- video driver defs #ifndef _VID_H #define _VID_H diff --git a/common/vid_aa.c b/common/vid_aa.c index 32bddc2..2c50245 100644 --- a/common/vid_aa.c +++ b/common/vid_aa.c @@ -1,24 +1,32 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999-2000 contributors of the QuakeForge project -Copyright (C) 1999-2000 Nelson Rush. + vid_aa.c -Please see the file "AUTHORS" for a list of contributors + (description) -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999-2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include diff --git a/common/vid_dos.c b/common/vid_dos.c index 9023682..992d352 100644 --- a/common/vid_dos.c +++ b/common/vid_dos.c @@ -1,28 +1,33 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Portions Copyright (C) 1999,2000 Nelson Rush. -Please see the file "AUTHORS" for a list of contributors + vid_dos.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + DOS-specific video routines -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// vid_dos.c: DOS-specific video routines -// #ifdef HAVE_UNISTD_H #include @@ -34,10 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "quakedef.h" -#include "d_local.h" -#include "dosisms.h" -#include "vid_dos.h" +#include +#include +#include +#include int vid_modenum; vmode_t *pcurrentmode = NULL; diff --git a/common/vid_ext.c b/common/vid_ext.c index fbdb5f9..9b7235b 100644 --- a/common/vid_ext.c +++ b/common/vid_ext.c @@ -1,38 +1,42 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid_ext.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + extended video modes, VESA-specific DOS video stuff -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// vid_ext.c: extended video modes -// in this implementation, VESA-specific DOS video stuff -// // TODO: make dependencies on vid_vga.c explicit or eliminate them #include #include -#include "quakedef.h" -#include "d_local.h" -#include "dosisms.h" -#include "vid_dos.h" +#include +#include +#include +#include #include #define MODE_SUPPORTED_IN_HW 0x0001 diff --git a/common/vid_ggi.c b/common/vid_ggi.c index b66cc5d..dcd24fa 100644 --- a/common/vid_ggi.c +++ b/common/vid_ggi.c @@ -1,23 +1,32 @@ /* -vid_ggi.c - general LibGGI video driver -Copyright (C) 1999 Marcus Sundberg [mackan@stacken.kth.se] -Portions Copyright (C) 1996-1997 Id Software, Inc. + vid_ggi.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + general LibGGI video driver -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999 Marcus Sundberg [mackan@stacken.kth.se] + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #define _BSD @@ -43,9 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. viddef_t vid; // global video state unsigned short d_8to16table[256]; -//cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE}; cvar_t *_windowed_mouse; -//cvar_t m_filter = {"m_filter","0", CVAR_ARCHIVE}; cvar_t *m_filter; #define NUM_STDBUTTONS 3 @@ -902,7 +909,8 @@ void IN_Frame(void) void IN_Init(void) { - _windowed_mouse = Cvar_Get("_windowed_mouse", "0", CVAR_ARCHIVE, "None"); + _windowed_mouse = Cvar_Get("_windowed_mouse", "0", CVAR_ARCHIVE, + "None"); old_windowed_mouse = -1; /* Force update */ m_filter = Cvar_Get("m_filter","0",CVAR_ARCHIVE, "None"); if (COM_CheckParm ("-nomouse")) return; @@ -982,3 +990,4 @@ void VID_InitCvars () { // It may not look it, but this is important } + diff --git a/common/vid_null.c b/common/vid_null.c index 815a787..29d9243 100644 --- a/common/vid_null.c +++ b/common/vid_null.c @@ -1,24 +1,31 @@ /* -vid_null.c - null video driver to aid porting efforts -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid_null.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + null video driver to aid porting efforts -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include diff --git a/common/vid_sdl.c b/common/vid_sdl.c index 2f3d50a..d602920 100644 --- a/common/vid_sdl.c +++ b/common/vid_sdl.c @@ -1,24 +1,31 @@ /* -vid_sdl.h - sdl video driver -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid_sdl.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + sdl video driver -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include @@ -33,7 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -//cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE}; cvar_t *_windowed_mouse; diff --git a/common/vid_sunx.c b/common/vid_sunx.c index 89df660..bcb0860 100644 --- a/common/vid_sunx.c +++ b/common/vid_sunx.c @@ -1,25 +1,32 @@ /* -vid_sunx.c - sun x11 video driver -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999-2000 contributors of the QuakeForge project -Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] -Please see the file "AUTHORS" for a list of contributors + vid_sunx.c + + Sun X11 video driver -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #define _BSD @@ -59,9 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -//cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE}; cvar_t *_windowed_mouse; -//cvar_t m_filter = {"m_filter","0", CVAR_ARCHIVE}; cvar_t *m_filter; static qboolean mouse_avail; @@ -1169,3 +1174,4 @@ void VID_InitCvars (void) { // It may not look like it, but this is important } + diff --git a/common/vid_sunxil.c b/common/vid_sunxil.c index 9ccf4d6..e0c1552 100644 --- a/common/vid_sunxil.c +++ b/common/vid_sunxil.c @@ -1,26 +1,33 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid_sunxil.c + + uses X to setup windows and XIL to copy images (scaled as needed) + to screen + + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -See the GNU General Public License for more details. + See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// vid_sunxil.c -- uses X to setup windows and XIL to copy images (scaled as needed) -// to screen #define _BSD #define BYTE_DEFINED 1 @@ -44,16 +51,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "quakedef.h" -#include "d_local.h" +#include +#include #include #define MIN_WIDTH 320 #define MIN_HEIGHT 200 -//cvar_t _windowed_mouse = {"_windowed_mouse","0", true}; cvar_t *_windowed_mouse; -//cvar_t m_filter = {"m_filter","0", true}; cvar_t *m_filter; float old_windowed_mouse; @@ -153,7 +158,6 @@ static int verbose=1; static byte current_palette[768]; -//cvar_t pixel_multiply = {"pixel_multiply", "2", true}; cvar_t *pixel_multiply; int current_pixel_multiply = 2; @@ -1283,3 +1287,4 @@ void VID_InitCvars () { // It may not look like it, but this is important } + diff --git a/common/vid_svgalib.c b/common/vid_svgalib.c index e034761..cadc9be 100644 --- a/common/vid_svgalib.c +++ b/common/vid_svgalib.c @@ -1,26 +1,34 @@ /* -vid_svgalib.c - Linux SVGALib video routines -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999-2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors -Copyright (C) 1999-2000 Nelson Rush. -Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se] -Copyright (C) 1999-2000 XoXus [xoxus@usa.net] + vid_svgalib.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + inux SVGALib video routines -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999-2000 Nelson Rush. + Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se] + Copyright (C) 1999-2000 XoXus [xoxus@usa.net] + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include @@ -61,11 +69,8 @@ static byte vid_current_palette[768]; static int svgalib_inited=0; static int UseDisplay = 1; -//static cvar_t vid_mode = {"vid_mode","5",false}; static cvar_t *vid_mode; -// static cvar_t vid_redrawfull = {"vid_redrawfull","0",false}; static cvar_t *vid_redrawfull; -//static cvar_t vid_waitforrefresh = {"vid_waitforrefresh","0",true}; static cvar_t *vid_waitforrefresh; static char *framebuffer_ptr; @@ -510,11 +515,8 @@ VID_Init(unsigned char *palette) VID_InitModes(); -// Cvar_RegisterVariable (&vid_mode); vid_mode = Cvar_Get ("vid_mode","5",0,"None"); -// Cvar_RegisterVariable (&vid_redrawfull); vid_redrawfull = Cvar_Get ("vid_redrawfull","0",0,"None"); -// Cvar_RegisterVariable (&vid_waitforrefresh); vid_waitforrefresh = Cvar_Get ("vid_waitforrefresh","0", CVAR_ARCHIVE,"None"); @@ -695,3 +697,4 @@ void VID_InitCvars () { // It may not look like it, but this is important } + diff --git a/common/vid_vga.c b/common/vid_vga.c index 358923f..5033b49 100644 --- a/common/vid_vga.c +++ b/common/vid_vga.c @@ -1,36 +1,41 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + vid_vga.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + VGA-specific DOS video stuff -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// -// vid_vga.c: VGA-specific DOS video stuff -// // TODO: proper handling of page-swap failure #include -#include "quakedef.h" -#include "d_local.h" -#include "dosisms.h" -#include "vid_dos.h" +#include +#include +#include +#include #include extern regs_t regs; @@ -48,7 +53,7 @@ int vid_surfcachesize; int VGA_highhunkmark; -#include "vgamodes.h" +#include #define NUMVIDMODES (sizeof(vgavidmodes) / sizeof(vgavidmodes[0])) @@ -392,7 +397,7 @@ int VGA_InitMode (viddef_t *lvid, vmode_t *pcurrentmode) if (_vid_wait_override->value) { - "vid_wait"->value = (float)VID_WAIT_VSYNC; + vid_wait->value = (float)VID_WAIT_VSYNC; } else { diff --git a/common/vid_win.c b/common/vid_win.c index 0c38ca6..caa7424 100644 --- a/common/vid_win.c +++ b/common/vid_win.c @@ -1,25 +1,32 @@ /* -vid_win.c - Win32 video driver -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Portions Copyright (C) 1999,2000 Nelson Rush. -Please see the file "AUTHORS" for a list of contributors + vid_win.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Win32 video driver -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 Nelson Rush. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include @@ -89,37 +96,22 @@ viddef_t vid; // global video state #define MODE_FULLSCREEN_DEFAULT (MODE_WINDOWED + 3) // Note that 0 is MODE_WINDOWED -//cvar_t vid_mode = {"vid_mode","0", CVAR_NONE}; cvar_t *vid_mode; // Note that 0 is MODE_WINDOWED -//cvar_t _vid_default_mode = {"_vid_default_mode","0", CVAR_ARCHIVE}; cvar_t *_vid_default_mode; // Note that 3 is MODE_FULLSCREEN_DEFAULT -//cvar_t _vid_default_mode_win = {"_vid_default_mode_win","3", CVAR_ARCHIVE}; cvar_t *_vid_default_mode_win; -//cvar_t vid_wait = {"vid_wait","0"}; cvar_t *vid_wait; -//cvar_t vid_nopageflip = {"vid_nopageflip","0", CVAR_ARCHIVE}; cvar_t *vid_nopageflip; -//cvar_t _vid_wait_override = {"_vid_wait_override", "0", CVAR_ARCHIVE}; cvar_t *_vid_wait_override; -//cvar_t vid_config_x = {"vid_config_x","800", CVAR_ARCHIVE}; cvar_t *vid_config_x; -//cvar_t vid_config_y = {"vid_config_y","600", CVAR_ARCHIVE}; cvar_t *vid_config_y; -//cvar_t vid_stretch_by_2 = {"vid_stretch_by_2","1", CVAR_ARCHIVE}; cvar_t *vid_stretch_by_2; -//cvar_t _windowed_mouse = {"_windowed_mouse","0", CVAR_ARCHIVE}; cvar_t *_windowed_mouse; -//cvar_t vid_fullscreen_mode = {"vid_fullscreen_mode","3", CVAR_ARCHIVE}; cvar_t *vid_fullscreen_mode; -//cvar_t vid_windowed_mode = {"vid_windowed_mode","0", CVAR_ARCHIVE}; cvar_t *vid_windowed_mode; -//cvar_t block_switch = {"block_switch","0", CVAR_ARCHIVE}; cvar_t *block_switch; -//cvar_t vid_window_x = {"vid_window_x", "0", CVAR_ARCHIVE}; cvar_t *vid_window_x; -//cvar_t vid_window_y = {"vid_window_y", "0", CVAR_ARCHIVE}; cvar_t *vid_window_y; typedef struct { @@ -3493,3 +3485,4 @@ void VID_InitCvars() { // It may not look like it, but this is important } + diff --git a/common/vid_x11.c b/common/vid_x11.c index 36d45df..dac93bf 100644 --- a/common/vid_x11.c +++ b/common/vid_x11.c @@ -1,25 +1,33 @@ /* -vid_x11.c - general x11 video driver -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999-2000 contributors of the QuakeForge project -Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] -Please see the file "AUTHORS" for a list of contributors + vid_x11.c -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + general x11 video driver -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999-2000 contributors of the QuakeForge project + Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se] + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -See the GNU General Public License for more details. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #define _BSD diff --git a/common/view.c b/common/view.c index 61748de..3066c44 100644 --- a/common/view.c +++ b/common/view.c @@ -1,25 +1,31 @@ /* -view.c - player eye positioning + view.c -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + player eye positioning -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ #include @@ -1088,3 +1094,4 @@ V_Init ( void ) BuildGammaTable (v_gamma->value); // no gamma yet } + diff --git a/common/view.h b/common/view.h index 65cd80b..b634545 100644 --- a/common/view.h +++ b/common/view.h @@ -1,25 +1,30 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 1999,2000 contributors of the QuakeForge project -Please see the file "AUTHORS" for a list of contributors + view.h -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. + Copyright (C) 1996-1997 Id Software, Inc. + Copyright (C) 1999,2000 contributors of the QuakeForge project + Please see the file "AUTHORS" for a list of contributors -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. -See the GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to: + + Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307, USA + + $Id$ */ -// view.h extern cvar_t *v_gamma; extern byte gammatable[256]; // palette is sent through this @@ -34,3 +39,4 @@ float V_CalcRoll (vec3_t angles, vec3_t velocity); void V_UpdatePalette (void); void V_CalcPowerupCshift (void); qboolean V_CheckGamma (void); +