Pure cleaning commit: removed "crc.[ch]" and "gl_warp_sin.h", removed dead functions...

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

diff --git a/cd_bsd.c b/cd_bsd.c
index 4ee469c5c044d545f397958c11aa82c6d437b27a..0608297fc2af5f812b3d3eb616f50c88eb79c9e8 100644 (file)
--- a/cd_bsd.c
+++ b/cd_bsd.c
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 
 #ifndef __FreeBSD__

diff --git a/cd_linux.c b/cd_linux.c
index 9aa633f75ecbb76b4c22b8a9f93b26740a5cf246..9d428f50a9e3602033b1aa079c2dd233f7ccf30f 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 
 static int cdfile = -1;

diff --git a/cd_sdl.c b/cd_sdl.c
index 4ec4f95805573e7cdd33fcc5ae45ca4ae42fa75f..fd75fec0ec7e74597fa0a86fc361a28126b527bc 100644 (file)
--- a/cd_sdl.c
+++ b/cd_sdl.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "cdaudio.h"
 #include <SDL.h>
 
 /*IMPORTANT: 

diff --git a/cd_shared.c b/cd_shared.c
index 575540268228bcce31bf67b0c6db61809c2e01b9..9cedbac1e8fae162c40914d567fbb47502f9ca3a 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "snd_main.h"
 
 #define MAXTRACKS      256

diff --git a/cd_win.c b/cd_win.c
index b7c49173cba5d9549074043fae5a03fb135747de..16f08c6871375f7f72de88093c876bf09d1e75fa 100644 (file)
--- a/cd_win.c
+++ b/cd_win.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 
 extern HWND    mainwindow;

diff --git a/cl_input.c b/cl_input.c
index e528439750445557a09ec2aa5fda98349b9046a2..0e48860b1dec4195fe0d6058f3c729f9068a45d0 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -56,6 +56,8 @@ kbutton_t     in_button3, in_button4, in_button5, in_button6, in_button7, in_button8
 
 int                    in_impulse;
 
+extern cvar_t sys_ticrate;
+
 
 void KeyDown (kbutton_t *b)
 {

diff --git a/cl_parse.c b/cl_parse.c
index 6272ccf28cf924bc06b80c602f906206779bad94..5fee1c839f4775e953919727b203b69e21e2fe6f 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // cl_parse.c  -- parse a message received from the server
 
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "cl_collision.h"
 
 char *svc_strings[128] =

diff --git a/common.c b/common.c
index 55623fa3eb7396c32be7c5c441c8e83bd5f39c6c..23658af4ae60551230b2e0e23ae18fc0e70eaa90 100644 (file)
--- a/common.c
+++ b/common.c
@@ -118,6 +118,66 @@ unsigned short BuffLittleShort (const qbyte *buffer)
 }
 
 
+/*
+============================================================================
+
+                                       CRC FUNCTIONS
+
+============================================================================
+*/
+
+// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
+// and the initial and final xor values shown below...  in other words, the
+// CCITT standard CRC used by XMODEM
+
+#define CRC_INIT_VALUE 0xffff
+#define CRC_XOR_VALUE  0x0000
+
+static unsigned short crctable[256] =
+{
+       0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
+       0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
+       0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
+       0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
+       0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
+       0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
+       0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
+       0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
+       0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
+       0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
+       0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
+       0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
+       0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
+       0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
+       0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
+       0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
+       0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
+       0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
+       0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
+       0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
+       0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
+       0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+       0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
+       0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
+       0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
+       0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
+       0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
+       0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
+       0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
+       0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
+       0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
+       0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
+};
+
+unsigned short CRC_Block(qbyte *data, int size)
+{
+       unsigned short crc = CRC_INIT_VALUE;
+       while (size--)
+               crc = (crc << 8) ^ crctable[(crc >> 8) ^ (*data++)];
+       return crc ^ CRC_XOR_VALUE;
+}
+
+
 /*
 ==============================================================================
 

diff --git a/common.h b/common.h
index f367ef66f705dae53b8894e93ca31a2e595084d6..9da99680cc2399cbdb46734f24fee0c655351bf1 100644 (file)
--- a/common.h
+++ b/common.h
@@ -52,6 +52,8 @@ void SZ_HexDumpToConsole(const sizebuf_t *buf);
 
 void Com_HexDumpToConsole(const qbyte *data, int size);
 
+unsigned short CRC_Block(qbyte *data, int size);
+
 
 //============================================================================
 //                                                     Endianess handling

diff --git a/crc.c b/crc.c
deleted file mode 100644 (file)
index 57f7d3a..0000000
--- a/crc.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-/* crc.c */
-
-#include "quakedef.h"
-#include "crc.h"
-
-// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
-// and the initial and final xor values shown below...  in other words, the
-// CCITT standard CRC used by XMODEM
-
-#define CRC_INIT_VALUE 0xffff
-#define CRC_XOR_VALUE  0x0000
-
-static unsigned short crctable[256] =
-{
-       0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
-       0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
-       0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
-       0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
-       0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
-       0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
-       0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
-       0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
-       0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
-       0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
-       0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
-       0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
-       0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
-       0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
-       0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
-       0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
-       0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
-       0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
-       0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
-       0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
-       0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
-       0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-       0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
-       0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
-       0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
-       0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
-       0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
-       0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
-       0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
-       0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
-       0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
-       0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
-};
-
-void CRC_Init(unsigned short *crcvalue)
-{
-       *crcvalue = CRC_INIT_VALUE;
-}
-
-void CRC_ProcessByte(unsigned short *crcvalue, qbyte data)
-{
-       *crcvalue = (*crcvalue << 8) ^ crctable[(*crcvalue >> 8) ^ data];
-}
-
-// LordHavoc: added for speed reasons
-void CRC_ProcessBytes(unsigned short *crcvalue, qbyte *data, int size)
-{
-       unsigned short crc;
-       crc = *crcvalue;
-       while (size--)
-               crc = (crc << 8) ^ crctable[(crc >> 8) ^ (*data++)];
-       *crcvalue = crc;
-}
-
-unsigned short CRC_Value(unsigned short crcvalue)
-{
-       return crcvalue ^ CRC_XOR_VALUE;
-}
-
-// LordHavoc: further speed and usability improvement
-unsigned short CRC_Block(qbyte *data, int size)
-{
-       unsigned short crc = CRC_INIT_VALUE;
-       while (size--)
-               crc = (crc << 8) ^ crctable[(crc >> 8) ^ (*data++)];
-       return crc ^ CRC_XOR_VALUE;
-}
-

diff --git a/crc.h b/crc.h
deleted file mode 100644 (file)
index ec12ce8..0000000
--- a/crc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-/* crc.h */
-
-#ifndef CRC_H
-#define CRC_H
-
-void CRC_Init(unsigned short *crcvalue);
-void CRC_ProcessByte(unsigned short *crcvalue, qbyte data);
-// LordHavoc: added this for speed reasons
-void CRC_ProcessBytes(unsigned short *crcvalue, qbyte *data, int size);
-unsigned short CRC_Value(unsigned short crcvalue);
-// LordHavoc: further speed and usability improvement
-unsigned short CRC_Block(qbyte *data, int size);
-
-#endif
-

diff --git a/darkplaces.dev b/darkplaces.dev
index 1c3f6b6a026fe32e3a2f5473d68cac2be507aef8..896d9e4dec88a5344d9e4b5156cc5765ebff673a 100644 (file)
--- a/darkplaces.dev
+++ b/darkplaces.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=darkplaces.dev
 Name=DarkPlaces
-UnitCount=161
+UnitCount=158
 Type=0
 Ver=1
 ObjFiles=
@@ -180,7 +180,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit16]
-FileName=crc.h
+FileName=snd_main.h
 CompileCpp=0
 Folder=Header Files
 Compile=1
@@ -250,7 +250,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit23]
-FileName=gl_warp_sin.h
+FileName=polygon.h
 CompileCpp=0
 Folder=Header Files
 Compile=1
@@ -940,7 +940,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit92]
-FileName=crc.c
+FileName=polygon.c
 CompileCpp=0
 Folder=Source Files
 Compile=1
@@ -1609,26 +1609,6 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit159]
-FileName=polygon.c
-CompileCpp=0
-Folder=Source Files
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit160]
-FileName=polygon.h
-CompileCpp=0
-Folder=Header Files
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [VersionInfo]
 Major=0
 Minor=1
@@ -1647,13 +1627,3 @@ ProductName=DarkPlaces
 ProductVersion=
 AutoIncBuildNr=0
 
-[Unit161]
-FileName=snd_main.h
-CompileCpp=0
-Folder=Header Files
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-

diff --git a/darkplaces.dsp b/darkplaces.dsp
index d6482d8c0234260fd0f2bbca6788b355d337f9d9..4a0def0edcb123eff0a53a9ff535eaf6b71512e3 100644 (file)
--- a/darkplaces.dsp
+++ b/darkplaces.dsp
@@ -164,10 +164,6 @@ SOURCE=.\console.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\crc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\curves.c\r
 # End Source File\r
 # Begin Source File\r
@@ -500,10 +496,6 @@ SOURCE=.\console.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\crc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=.\curves.h\r
 # End Source File\r
 # Begin Source File\r
@@ -676,19 +668,19 @@ SOURCE=.\server.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\snd_ogg.h\r
+SOURCE=.\snd_main.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\snd_wav.h\r
+SOURCE=.\snd_ogg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\sound.h\r
+SOURCE=.\snd_wav.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\snd_main.h\r
+SOURCE=.\sound.h\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/gl_draw.c b/gl_draw.c
index 88f5a9558ab9b6c67747c7e3fe826475bf7124a1..336912a1be04020649fb70f95660914bc177dbd0 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "wad.h"
+
 
 static rtexture_t *char_texture;
 

diff --git a/gl_warp_sin.h b/gl_warp_sin.h
deleted file mode 100644 (file)
index fdf1226..0000000
--- a/gl_warp_sin.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-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 the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
-// This thing is a table, don't include it normally, okay?
-
- 0, 0.19633, 0.392541, 0.588517, 0.784137, 0.979285, 1.17384, 1.3677,
- 1.56072, 1.75281, 1.94384, 2.1337, 2.32228, 2.50945, 2.69512, 2.87916,
- 3.06147, 3.24193, 3.42044, 3.59689, 3.77117, 3.94319, 4.11282, 4.27998,
- 4.44456, 4.60647, 4.76559, 4.92185, 5.07515, 5.22538, 5.37247, 5.51632,
- 5.65685, 5.79398, 5.92761, 6.05767, 6.18408, 6.30677, 6.42566, 6.54068,
- 6.65176, 6.75883, 6.86183, 6.9607, 7.05537, 7.14579, 7.23191, 7.31368,
- 7.39104, 7.46394, 7.53235, 7.59623, 7.65552, 7.71021, 7.76025, 7.80562,
- 7.84628, 7.88222, 7.91341, 7.93984, 7.96148, 7.97832, 7.99036, 7.99759,
- 8, 7.99759, 7.99036, 7.97832, 7.96148, 7.93984, 7.91341, 7.88222,
- 7.84628, 7.80562, 7.76025, 7.71021, 7.65552, 7.59623, 7.53235, 7.46394,
- 7.39104, 7.31368, 7.23191, 7.14579, 7.05537, 6.9607, 6.86183, 6.75883,
- 6.65176, 6.54068, 6.42566, 6.30677, 6.18408, 6.05767, 5.92761, 5.79398,
- 5.65685, 5.51632, 5.37247, 5.22538, 5.07515, 4.92185, 4.76559, 4.60647,
- 4.44456, 4.27998, 4.11282, 3.94319, 3.77117, 3.59689, 3.42044, 3.24193,
- 3.06147, 2.87916, 2.69512, 2.50945, 2.32228, 2.1337, 1.94384, 1.75281,
- 1.56072, 1.3677, 1.17384, 0.979285, 0.784137, 0.588517, 0.392541, 0.19633,
- 9.79717e-16, -0.19633, -0.392541, -0.588517, -0.784137, -0.979285, -1.17384, -1.3677,
- -1.56072, -1.75281, -1.94384, -2.1337, -2.32228, -2.50945, -2.69512, -2.87916,
- -3.06147, -3.24193, -3.42044, -3.59689, -3.77117, -3.94319, -4.11282, -4.27998,
- -4.44456, -4.60647, -4.76559, -4.92185, -5.07515, -5.22538, -5.37247, -5.51632,
- -5.65685, -5.79398, -5.92761, -6.05767, -6.18408, -6.30677, -6.42566, -6.54068,
- -6.65176, -6.75883, -6.86183, -6.9607, -7.05537, -7.14579, -7.23191, -7.31368,
- -7.39104, -7.46394, -7.53235, -7.59623, -7.65552, -7.71021, -7.76025, -7.80562,
- -7.84628, -7.88222, -7.91341, -7.93984, -7.96148, -7.97832, -7.99036, -7.99759,
- -8, -7.99759, -7.99036, -7.97832, -7.96148, -7.93984, -7.91341, -7.88222,
- -7.84628, -7.80562, -7.76025, -7.71021, -7.65552, -7.59623, -7.53235, -7.46394,
- -7.39104, -7.31368, -7.23191, -7.14579, -7.05537, -6.9607, -6.86183, -6.75883,
- -6.65176, -6.54068, -6.42566, -6.30677, -6.18408, -6.05767, -5.92761, -5.79398,
- -5.65685, -5.51632, -5.37247, -5.22538, -5.07515, -4.92185, -4.76559, -4.60647,
- -4.44456, -4.27998, -4.11282, -3.94319, -3.77117, -3.59689, -3.42044, -3.24193,
- -3.06147, -2.87916, -2.69512, -2.50945, -2.32228, -2.1337, -1.94384, -1.75281,
- -1.56072, -1.3677, -1.17384, -0.979285, -0.784137, -0.588517, -0.392541, -0.19633,
-

diff --git a/host.c b/host.c
index 6c244d459975ba2c5d266e0f669014fa5f6376ad..9156d886d4ff2cf737abea4c538a25a22bdaebbc 100644 (file)
--- a/host.c
+++ b/host.c
@@ -21,7 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <time.h>
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "cl_video.h"
+#include "progsvm.h"
 
 /*
 

diff --git a/image.h b/image.h
index 6ff4b73548c4d9443a7d45fc953ef055bc0d9f83..6a49f5a29a4f6aad6ceaa54c11b0e54830c981d1 100644 (file)
--- a/image.h
+++ b/image.h
@@ -2,6 +2,10 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+
+extern int image_width, image_height;
+
+
 // swizzle components (even converting number of components) and flip images
 // (warning: input must be different than output due to non-linear read/write)
 // (tip: component indices can contain values | 0x80000000 to tell it to

diff --git a/jpeg.c b/jpeg.c
index 47f45e9188b3e29a40af80025c2fc36676e4c51a..ba1d8913aebcbe94d8d7ab19a784a575f6f32de5 100644 (file)
--- a/jpeg.c
+++ b/jpeg.c
@@ -23,6 +23,7 @@
 
 
 #include "quakedef.h"
+#include "image.h"
 #include "jpeg.h"
 
 

diff --git a/keys.c b/keys.c
index 47ec8ab0ef3a12b5f3d2141a260fe1ac123dd345..b522bb4b816d37d1d731ea09fde3ba8abe762001 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -28,7 +28,6 @@ static const char rcsid[] =
 #include "quakedef.h"
 #include <ctype.h>
 
-extern void SCR_UpdateScreen (void);
 
 /*
 key up events are sent even if in console mode

diff --git a/makefile.inc b/makefile.inc
index 7568ec5d663ed07ea99e3df78ea000de8443ea99..9fcea9580bd825c1d940cfddb1208186cad00f31 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -43,7 +43,6 @@ OBJ_COMMON= \
        collision.o \
        common.o \
        console.o \
-       crc.o \
        curves.o \
        cvar.o \
        dpvsimpledecode.o \

diff --git a/menu.c b/menu.c
index 2f0bde724a1427858343edafda1bd684a94dd5bf..c2e7dc14811a3d48a6a852a1ef52af038a9476b7 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -18,7 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 #include "quakedef.h"
+#include "cdaudio.h"
 #include "image.h"
+#include "progsvm.h"
 
 #include "mprogdefs.h"
 

diff --git a/model_brush.c b/model_brush.c
index d70a58198890880109e9782d37e7fdba3add9f2d..90b16e766fe19ddd36f8436458c5f9063389d1ee 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -23,6 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "r_shadow.h"
 #include "polygon.h"
 #include "curves.h"
+#include "wad.h"
+
 
 // note: model_shared.c sets up r_notexture, and r_surf_notexture
 

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 5dc7a50c963577b38672c6de320ab85643d78e9c..67f687336d2d82dcbd6bed5af3efe4238dccad87 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -150,6 +150,7 @@ string      gethostcachestring(float type, float hostnr)
 
 #include "quakedef.h"
 #include "progdefs.h"
+#include "progsvm.h"
 #include "clprogdefs.h"
 #include "mprogdefs.h"
 

diff --git a/prvm_edict.c b/prvm_edict.c
index 5df2714a44840a46fcd047320d4f2bd9b9a93ad7..a99f5fdfd97f3d64d7612cc52c4e8a5752994296 100644 (file)
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // AK new vm 
 
 #include "quakedef.h"
+#include "progsvm.h"
 
 prvm_prog_t *prog;
 

diff --git a/prvm_exec.c b/prvm_exec.c
index 6ef71c3c119928a28ab34818b868a5afc202c6d5..09bebf29099f0b3947f4d59704e88a77666430bb 100644 (file)
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "progsvm.h"
 
 char *prvm_opnames[] =
 {

diff --git a/quakedef.h b/quakedef.h
index 12dbfc1f5c94661eb59e668978e33d3c824b889d..2f8866df39e21252817fe15dc2f2800f4e2318ee 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -188,7 +188,6 @@ extern char *buildstring;
 
 #include "r_textures.h"
 
-#include "wad.h"
 #include "draw.h"
 #include "screen.h"
 #include "netconn.h"
@@ -200,7 +199,6 @@ extern char *buildstring;
 #include "client.h"
 #include "render.h"
 #include "progs.h"
-#include "progsvm.h"
 #include "server.h"
 
 #include "input.h"
@@ -208,25 +206,20 @@ extern char *buildstring;
 #include "keys.h"
 #include "console.h"
 #include "menu.h"
-#include "crc.h"
-#include "cdaudio.h"
 
 #include "glquake.h"
 
 #include "ui.h"
+#include "palette.h"
 
 extern qboolean noclip_anglehack;
 
-//
-// host
-//
-extern cvar_t sys_ticrate;
 extern cvar_t developer;
 
 // true if into command execution
 extern qboolean host_initialized;
 extern double host_frametime;
-// LordHavoc: the real frametime, before slowmo and clamping are applied (used for console scrolling)
+// the real frametime, before slowmo and clamping are applied (used for console scrolling)
 extern double host_realframetime;
 // incremented every frame, never reset
 extern int host_framecount;
@@ -247,8 +240,6 @@ void Host_Reconnect_f(void);
 // skill level for currently loaded level (in case the user changes the cvar while the level is running, this reflects the level actually in use)
 extern int current_skill;
 
-extern int minimum_memory;
-
 //
 // chase
 //
@@ -261,8 +252,6 @@ void Chase_Update (void);
 void fractalnoise(unsigned char *noise, int size, int startgrid);
 void fractalnoisequick(unsigned char *noise, int size, int startgrid);
 
-#include "palette.h"
-
 void Sys_Shared_Init(void);
 
 #endif

diff --git a/sv_main.c b/sv_main.c
index 8110dce937188ba92c370f513b3477c3fda8c46d..e884eaec71af154292cc324d2e6f036759a60cf5 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -32,6 +32,8 @@ static cvar_t sv_cullentities_trace = {0, "sv_cullentities_trace", "0"}; // tend
 static cvar_t sv_cullentities_stats = {0, "sv_cullentities_stats", "0"};
 static cvar_t sv_entpatch = {0, "sv_entpatch", "1"};
 
+extern cvar_t sys_ticrate;
+
 cvar_t sv_gameplayfix_grenadebouncedownslopes = {0, "sv_gameplayfix_grenadebouncedownslopes", "1"};
 cvar_t sv_gameplayfix_noairborncorpse = {0, "sv_gameplayfix_noairborncorpse", "1"};
 cvar_t sv_gameplayfix_stepdown = {0, "sv_gameplayfix_stepdown", "1"};

diff --git a/vid_shared.c b/vid_shared.c
index f6078467cc19ecff2a2801190848fdd92e77d629..aecaaa8a8648ea1d55d0f790daaaa66723fc9466 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -1,5 +1,6 @@
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 // global video state
 viddef_t vid;

diff --git a/wad.c b/wad.c
index 9886fb20f9070d98c0823282807ddbd97df09aa1..0f4459c89862d23066a1593ca141ec81947b0adc 100644 (file)
--- a/wad.c
+++ b/wad.c
@@ -17,12 +17,16 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-// wad.c
+
 
 #include "quakedef.h"
+#include "image.h"
+#include "wad.h"
+
 
 void SwapPic (qpic_t *pic);
 
+
 /*
 ==================
 W_CleanupName

diff --git a/wad.h b/wad.h
index 9283b36b99bf8ca016e357b9543f420a3d98e164..edef176d79ae90f294765e6fa2bc90037a820708 100644 (file)
--- a/wad.h
+++ b/wad.h
@@ -71,10 +71,8 @@ extern       qbyte           *wad_base;
 
 void   *W_GetLumpName (char *name);
 
-void SwapPic (qpic_t *pic);
 
 // LordHavoc: added alternate texture WAD2/WAD3 system for easier loading of HalfLife texture wads
-extern int image_width, image_height;
 void   W_LoadTextureWadFile (char *filename, int complain);
 qbyte  *W_GetTexture (char *name); // returns tempmempool allocated image data, width and height are in image_width and image_height
 qbyte  *W_ConvertWAD3Texture(miptex_t *tex); // returns tempmempool allocated image data, width and height are in image_width and image_height