diff --git a/ref_soft/adivtab.h b/ref_soft/adivtab.h deleted file mode 100644 index aad0c56..0000000 --- a/ref_soft/adivtab.h +++ /dev/null @@ -1,1077 +0,0 @@ -/* -Copyright (C) 1997-2001 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. - -*/ -// table of quotients and remainders for [-15...16] / [-15...16] - -// numerator = -15 -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{1, -5}, -{1, -6}, -{1, -7}, -{2, -1}, -{2, -3}, -{3, 0}, -{3, -3}, -{5, 0}, -{7, -1}, -{15, 0}, -{0, 0}, -{-15, 0}, -{-8, 1}, -{-5, 0}, -{-4, 1}, -{-3, 0}, -{-3, 3}, -{-3, 6}, -{-2, 1}, -{-2, 3}, -{-2, 5}, -{-2, 7}, -{-2, 9}, -{-2, 11}, -{-2, 13}, -{-1, 0}, -{-1, 1}, -// numerator = -14 -{0, -14}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{1, -5}, -{1, -6}, -{2, 0}, -{2, -2}, -{2, -4}, -{3, -2}, -{4, -2}, -{7, 0}, -{14, 0}, -{0, 0}, -{-14, 0}, -{-7, 0}, -{-5, 1}, -{-4, 2}, -{-3, 1}, -{-3, 4}, -{-2, 0}, -{-2, 2}, -{-2, 4}, -{-2, 6}, -{-2, 8}, -{-2, 10}, -{-2, 12}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -// numerator = -13 -{0, -13}, -{0, -13}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{1, -5}, -{1, -6}, -{2, -1}, -{2, -3}, -{3, -1}, -{4, -1}, -{6, -1}, -{13, 0}, -{0, 0}, -{-13, 0}, -{-7, 1}, -{-5, 2}, -{-4, 3}, -{-3, 2}, -{-3, 5}, -{-2, 1}, -{-2, 3}, -{-2, 5}, -{-2, 7}, -{-2, 9}, -{-2, 11}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -// numerator = -12 -{0, -12}, -{0, -12}, -{0, -12}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{1, -5}, -{2, 0}, -{2, -2}, -{3, 0}, -{4, 0}, -{6, 0}, -{12, 0}, -{0, 0}, -{-12, 0}, -{-6, 0}, -{-4, 0}, -{-3, 0}, -{-3, 3}, -{-2, 0}, -{-2, 2}, -{-2, 4}, -{-2, 6}, -{-2, 8}, -{-2, 10}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -// numerator = -11 -{0, -11}, -{0, -11}, -{0, -11}, -{0, -11}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{1, -5}, -{2, -1}, -{2, -3}, -{3, -2}, -{5, -1}, -{11, 0}, -{0, 0}, -{-11, 0}, -{-6, 1}, -{-4, 1}, -{-3, 1}, -{-3, 4}, -{-2, 1}, -{-2, 3}, -{-2, 5}, -{-2, 7}, -{-2, 9}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -// numerator = -10 -{0, -10}, -{0, -10}, -{0, -10}, -{0, -10}, -{0, -10}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{2, 0}, -{2, -2}, -{3, -1}, -{5, 0}, -{10, 0}, -{0, 0}, -{-10, 0}, -{-5, 0}, -{-4, 2}, -{-3, 2}, -{-2, 0}, -{-2, 2}, -{-2, 4}, -{-2, 6}, -{-2, 8}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -// numerator = -9 -{0, -9}, -{0, -9}, -{0, -9}, -{0, -9}, -{0, -9}, -{0, -9}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{1, -4}, -{2, -1}, -{3, 0}, -{4, -1}, -{9, 0}, -{0, 0}, -{-9, 0}, -{-5, 1}, -{-3, 0}, -{-3, 3}, -{-2, 1}, -{-2, 3}, -{-2, 5}, -{-2, 7}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -// numerator = -8 -{0, -8}, -{0, -8}, -{0, -8}, -{0, -8}, -{0, -8}, -{0, -8}, -{0, -8}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{2, 0}, -{2, -2}, -{4, 0}, -{8, 0}, -{0, 0}, -{-8, 0}, -{-4, 0}, -{-3, 1}, -{-2, 0}, -{-2, 2}, -{-2, 4}, -{-2, 6}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -// numerator = -7 -{0, -7}, -{0, -7}, -{0, -7}, -{0, -7}, -{0, -7}, -{0, -7}, -{0, -7}, -{0, -7}, -{1, 0}, -{1, -1}, -{1, -2}, -{1, -3}, -{2, -1}, -{3, -1}, -{7, 0}, -{0, 0}, -{-7, 0}, -{-4, 1}, -{-3, 2}, -{-2, 1}, -{-2, 3}, -{-2, 5}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -// numerator = -6 -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{0, -6}, -{1, 0}, -{1, -1}, -{1, -2}, -{2, 0}, -{3, 0}, -{6, 0}, -{0, 0}, -{-6, 0}, -{-3, 0}, -{-2, 0}, -{-2, 2}, -{-2, 4}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -// numerator = -5 -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{0, -5}, -{1, 0}, -{1, -1}, -{1, -2}, -{2, -1}, -{5, 0}, -{0, 0}, -{-5, 0}, -{-3, 1}, -{-2, 1}, -{-2, 3}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -{-1, 11}, -// numerator = -4 -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{0, -4}, -{1, 0}, -{1, -1}, -{2, 0}, -{4, 0}, -{0, 0}, -{-4, 0}, -{-2, 0}, -{-2, 2}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -{-1, 11}, -{-1, 12}, -// numerator = -3 -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{0, -3}, -{1, 0}, -{1, -1}, -{3, 0}, -{0, 0}, -{-3, 0}, -{-2, 1}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -{-1, 11}, -{-1, 12}, -{-1, 13}, -// numerator = -2 -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{0, -2}, -{1, 0}, -{2, 0}, -{0, 0}, -{-2, 0}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -{-1, 11}, -{-1, 12}, -{-1, 13}, -{-1, 14}, -// numerator = -1 -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{0, -1}, -{1, 0}, -{0, 0}, -{-1, 0}, -{-1, 1}, -{-1, 2}, -{-1, 3}, -{-1, 4}, -{-1, 5}, -{-1, 6}, -{-1, 7}, -{-1, 8}, -{-1, 9}, -{-1, 10}, -{-1, 11}, -{-1, 12}, -{-1, 13}, -{-1, 14}, -{-1, 15}, -// numerator = 0 -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -{0, 0}, -// numerator = 1 -{-1, -14}, -{-1, -13}, -{-1, -12}, -{-1, -11}, -{-1, -10}, -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{0, 0}, -{1, 0}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -{0, 1}, -// numerator = 2 -{-1, -13}, -{-1, -12}, -{-1, -11}, -{-1, -10}, -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, 0}, -{0, 0}, -{2, 0}, -{1, 0}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -{0, 2}, -// numerator = 3 -{-1, -12}, -{-1, -11}, -{-1, -10}, -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -1}, -{-3, 0}, -{0, 0}, -{3, 0}, -{1, 1}, -{1, 0}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -{0, 3}, -// numerator = 4 -{-1, -11}, -{-1, -10}, -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -2}, -{-2, 0}, -{-4, 0}, -{0, 0}, -{4, 0}, -{2, 0}, -{1, 1}, -{1, 0}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -{0, 4}, -// numerator = 5 -{-1, -10}, -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -3}, -{-2, -1}, -{-3, -1}, -{-5, 0}, -{0, 0}, -{5, 0}, -{2, 1}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -{0, 5}, -// numerator = 6 -{-1, -9}, -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, 0}, -{-6, 0}, -{0, 0}, -{6, 0}, -{3, 0}, -{2, 0}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -{0, 6}, -// numerator = 7 -{-1, -8}, -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -5}, -{-2, -3}, -{-2, -1}, -{-3, -2}, -{-4, -1}, -{-7, 0}, -{0, 0}, -{7, 0}, -{3, 1}, -{2, 1}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -{0, 7}, -// numerator = 8 -{-1, -7}, -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -6}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, -1}, -{-4, 0}, -{-8, 0}, -{0, 0}, -{8, 0}, -{4, 0}, -{2, 2}, -{2, 0}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 8}, -{0, 8}, -{0, 8}, -{0, 8}, -{0, 8}, -{0, 8}, -{0, 8}, -{0, 8}, -// numerator = 9 -{-1, -6}, -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -7}, -{-2, -5}, -{-2, -3}, -{-2, -1}, -{-3, -3}, -{-3, 0}, -{-5, -1}, -{-9, 0}, -{0, 0}, -{9, 0}, -{4, 1}, -{3, 0}, -{2, 1}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 9}, -{0, 9}, -{0, 9}, -{0, 9}, -{0, 9}, -{0, 9}, -{0, 9}, -// numerator = 10 -{-1, -5}, -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -8}, -{-2, -6}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, -2}, -{-4, -2}, -{-5, 0}, -{-10, 0}, -{0, 0}, -{10, 0}, -{5, 0}, -{3, 1}, -{2, 2}, -{2, 0}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 10}, -{0, 10}, -{0, 10}, -{0, 10}, -{0, 10}, -{0, 10}, -// numerator = 11 -{-1, -4}, -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -9}, -{-2, -7}, -{-2, -5}, -{-2, -3}, -{-2, -1}, -{-3, -4}, -{-3, -1}, -{-4, -1}, -{-6, -1}, -{-11, 0}, -{0, 0}, -{11, 0}, -{5, 1}, -{3, 2}, -{2, 3}, -{2, 1}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 11}, -{0, 11}, -{0, 11}, -{0, 11}, -{0, 11}, -// numerator = 12 -{-1, -3}, -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -10}, -{-2, -8}, -{-2, -6}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, -3}, -{-3, 0}, -{-4, 0}, -{-6, 0}, -{-12, 0}, -{0, 0}, -{12, 0}, -{6, 0}, -{4, 0}, -{3, 0}, -{2, 2}, -{2, 0}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 12}, -{0, 12}, -{0, 12}, -{0, 12}, -// numerator = 13 -{-1, -2}, -{-1, -1}, -{-1, 0}, -{-2, -11}, -{-2, -9}, -{-2, -7}, -{-2, -5}, -{-2, -3}, -{-2, -1}, -{-3, -5}, -{-3, -2}, -{-4, -3}, -{-5, -2}, -{-7, -1}, -{-13, 0}, -{0, 0}, -{13, 0}, -{6, 1}, -{4, 1}, -{3, 1}, -{2, 3}, -{2, 1}, -{1, 6}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 13}, -{0, 13}, -{0, 13}, -// numerator = 14 -{-1, -1}, -{-1, 0}, -{-2, -12}, -{-2, -10}, -{-2, -8}, -{-2, -6}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, -4}, -{-3, -1}, -{-4, -2}, -{-5, -1}, -{-7, 0}, -{-14, 0}, -{0, 0}, -{14, 0}, -{7, 0}, -{4, 2}, -{3, 2}, -{2, 4}, -{2, 2}, -{2, 0}, -{1, 6}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 14}, -{0, 14}, -// numerator = 15 -{-1, 0}, -{-2, -13}, -{-2, -11}, -{-2, -9}, -{-2, -7}, -{-2, -5}, -{-2, -3}, -{-2, -1}, -{-3, -6}, -{-3, -3}, -{-3, 0}, -{-4, -1}, -{-5, 0}, -{-8, -1}, -{-15, 0}, -{0, 0}, -{15, 0}, -{7, 1}, -{5, 0}, -{3, 3}, -{3, 0}, -{2, 3}, -{2, 1}, -{1, 7}, -{1, 6}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, -{0, 15}, -// numerator = 16 -{-2, -14}, -{-2, -12}, -{-2, -10}, -{-2, -8}, -{-2, -6}, -{-2, -4}, -{-2, -2}, -{-2, 0}, -{-3, -5}, -{-3, -2}, -{-4, -4}, -{-4, 0}, -{-6, -2}, -{-8, 0}, -{-16, 0}, -{0, 0}, -{16, 0}, -{8, 0}, -{5, 1}, -{4, 0}, -{3, 1}, -{2, 4}, -{2, 2}, -{2, 0}, -{1, 7}, -{1, 6}, -{1, 5}, -{1, 4}, -{1, 3}, -{1, 2}, -{1, 1}, -{1, 0}, diff --git a/ref_soft/anorms.h b/ref_soft/anorms.h deleted file mode 100644 index 011582e..0000000 --- a/ref_soft/anorms.h +++ /dev/null @@ -1,181 +0,0 @@ -/* -Copyright (C) 1997-2001 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. - -*/ -{-0.525731, 0.000000, 0.850651}, -{-0.442863, 0.238856, 0.864188}, -{-0.295242, 0.000000, 0.955423}, -{-0.309017, 0.500000, 0.809017}, -{-0.162460, 0.262866, 0.951056}, -{0.000000, 0.000000, 1.000000}, -{0.000000, 0.850651, 0.525731}, -{-0.147621, 0.716567, 0.681718}, -{0.147621, 0.716567, 0.681718}, -{0.000000, 0.525731, 0.850651}, -{0.309017, 0.500000, 0.809017}, -{0.525731, 0.000000, 0.850651}, -{0.295242, 0.000000, 0.955423}, -{0.442863, 0.238856, 0.864188}, -{0.162460, 0.262866, 0.951056}, -{-0.681718, 0.147621, 0.716567}, -{-0.809017, 0.309017, 0.500000}, -{-0.587785, 0.425325, 0.688191}, -{-0.850651, 0.525731, 0.000000}, -{-0.864188, 0.442863, 0.238856}, -{-0.716567, 0.681718, 0.147621}, -{-0.688191, 0.587785, 0.425325}, -{-0.500000, 0.809017, 0.309017}, -{-0.238856, 0.864188, 0.442863}, -{-0.425325, 0.688191, 0.587785}, -{-0.716567, 0.681718, -0.147621}, -{-0.500000, 0.809017, -0.309017}, -{-0.525731, 0.850651, 0.000000}, -{0.000000, 0.850651, -0.525731}, -{-0.238856, 0.864188, -0.442863}, -{0.000000, 0.955423, -0.295242}, -{-0.262866, 0.951056, -0.162460}, -{0.000000, 1.000000, 0.000000}, -{0.000000, 0.955423, 0.295242}, -{-0.262866, 0.951056, 0.162460}, -{0.238856, 0.864188, 0.442863}, -{0.262866, 0.951056, 0.162460}, -{0.500000, 0.809017, 0.309017}, -{0.238856, 0.864188, -0.442863}, -{0.262866, 0.951056, -0.162460}, -{0.500000, 0.809017, -0.309017}, -{0.850651, 0.525731, 0.000000}, -{0.716567, 0.681718, 0.147621}, -{0.716567, 0.681718, -0.147621}, -{0.525731, 0.850651, 0.000000}, -{0.425325, 0.688191, 0.587785}, -{0.864188, 0.442863, 0.238856}, -{0.688191, 0.587785, 0.425325}, -{0.809017, 0.309017, 0.500000}, -{0.681718, 0.147621, 0.716567}, -{0.587785, 0.425325, 0.688191}, -{0.955423, 0.295242, 0.000000}, -{1.000000, 0.000000, 0.000000}, -{0.951056, 0.162460, 0.262866}, -{0.850651, -0.525731, 0.000000}, -{0.955423, -0.295242, 0.000000}, -{0.864188, -0.442863, 0.238856}, -{0.951056, -0.162460, 0.262866}, -{0.809017, -0.309017, 0.500000}, -{0.681718, -0.147621, 0.716567}, -{0.850651, 0.000000, 0.525731}, -{0.864188, 0.442863, -0.238856}, -{0.809017, 0.309017, -0.500000}, -{0.951056, 0.162460, -0.262866}, -{0.525731, 0.000000, -0.850651}, -{0.681718, 0.147621, -0.716567}, -{0.681718, -0.147621, -0.716567}, -{0.850651, 0.000000, -0.525731}, -{0.809017, -0.309017, -0.500000}, -{0.864188, -0.442863, -0.238856}, -{0.951056, -0.162460, -0.262866}, -{0.147621, 0.716567, -0.681718}, -{0.309017, 0.500000, -0.809017}, -{0.425325, 0.688191, -0.587785}, -{0.442863, 0.238856, -0.864188}, -{0.587785, 0.425325, -0.688191}, -{0.688191, 0.587785, -0.425325}, -{-0.147621, 0.716567, -0.681718}, -{-0.309017, 0.500000, -0.809017}, -{0.000000, 0.525731, -0.850651}, -{-0.525731, 0.000000, -0.850651}, -{-0.442863, 0.238856, -0.864188}, -{-0.295242, 0.000000, -0.955423}, -{-0.162460, 0.262866, -0.951056}, -{0.000000, 0.000000, -1.000000}, -{0.295242, 0.000000, -0.955423}, -{0.162460, 0.262866, -0.951056}, -{-0.442863, -0.238856, -0.864188}, -{-0.309017, -0.500000, -0.809017}, -{-0.162460, -0.262866, -0.951056}, -{0.000000, -0.850651, -0.525731}, -{-0.147621, -0.716567, -0.681718}, -{0.147621, -0.716567, -0.681718}, -{0.000000, -0.525731, -0.850651}, -{0.309017, -0.500000, -0.809017}, -{0.442863, -0.238856, -0.864188}, -{0.162460, -0.262866, -0.951056}, -{0.238856, -0.864188, -0.442863}, -{0.500000, -0.809017, -0.309017}, -{0.425325, -0.688191, -0.587785}, -{0.716567, -0.681718, -0.147621}, -{0.688191, -0.587785, -0.425325}, -{0.587785, -0.425325, -0.688191}, -{0.000000, -0.955423, -0.295242}, -{0.000000, -1.000000, 0.000000}, -{0.262866, -0.951056, -0.162460}, -{0.000000, -0.850651, 0.525731}, -{0.000000, -0.955423, 0.295242}, -{0.238856, -0.864188, 0.442863}, -{0.262866, -0.951056, 0.162460}, -{0.500000, -0.809017, 0.309017}, -{0.716567, -0.681718, 0.147621}, -{0.525731, -0.850651, 0.000000}, -{-0.238856, -0.864188, -0.442863}, -{-0.500000, -0.809017, -0.309017}, -{-0.262866, -0.951056, -0.162460}, -{-0.850651, -0.525731, 0.000000}, -{-0.716567, -0.681718, -0.147621}, -{-0.716567, -0.681718, 0.147621}, -{-0.525731, -0.850651, 0.000000}, -{-0.500000, -0.809017, 0.309017}, -{-0.238856, -0.864188, 0.442863}, -{-0.262866, -0.951056, 0.162460}, -{-0.864188, -0.442863, 0.238856}, -{-0.809017, -0.309017, 0.500000}, -{-0.688191, -0.587785, 0.425325}, -{-0.681718, -0.147621, 0.716567}, -{-0.442863, -0.238856, 0.864188}, -{-0.587785, -0.425325, 0.688191}, -{-0.309017, -0.500000, 0.809017}, -{-0.147621, -0.716567, 0.681718}, -{-0.425325, -0.688191, 0.587785}, -{-0.162460, -0.262866, 0.951056}, -{0.442863, -0.238856, 0.864188}, -{0.162460, -0.262866, 0.951056}, -{0.309017, -0.500000, 0.809017}, -{0.147621, -0.716567, 0.681718}, -{0.000000, -0.525731, 0.850651}, -{0.425325, -0.688191, 0.587785}, -{0.587785, -0.425325, 0.688191}, -{0.688191, -0.587785, 0.425325}, -{-0.955423, 0.295242, 0.000000}, -{-0.951056, 0.162460, 0.262866}, -{-1.000000, 0.000000, 0.000000}, -{-0.850651, 0.000000, 0.525731}, -{-0.955423, -0.295242, 0.000000}, -{-0.951056, -0.162460, 0.262866}, -{-0.864188, 0.442863, -0.238856}, -{-0.951056, 0.162460, -0.262866}, -{-0.809017, 0.309017, -0.500000}, -{-0.864188, -0.442863, -0.238856}, -{-0.951056, -0.162460, -0.262866}, -{-0.809017, -0.309017, -0.500000}, -{-0.681718, 0.147621, -0.716567}, -{-0.681718, -0.147621, -0.716567}, -{-0.850651, 0.000000, -0.525731}, -{-0.688191, 0.587785, -0.425325}, -{-0.587785, 0.425325, -0.688191}, -{-0.425325, 0.688191, -0.587785}, -{-0.425325, -0.688191, -0.587785}, -{-0.587785, -0.425325, -0.688191}, -{-0.688191, -0.587785, -0.425325}, diff --git a/src/Makefile.am b/src/Makefile.am index 09d1ee4..5eba2da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . -bin_PROGRAMS = quake2 ref_glx.so +bin_PROGRAMS = quake2 ref_glx.so ref_softx.so quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ \ @@ -28,7 +28,7 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ \ #snd_mixa.S -REF_GL = q_sh.c q_shared.c glob.c \ +REF_GL_COMMON = q_sh.c q_shared.c glob.c \ qgl.c \ \ gl_draw.c \ @@ -41,20 +41,88 @@ REF_GL = q_sh.c q_shared.c glob.c \ gl_rsurf.c \ gl_warp.c -ref_glx_so_SOURCES = $(REF_GL) gl_glx.c +# GLX +ref_glx_so_SOURCES = $(REF_GL_COMMON) gl_glx.c -#ref_fxgl_so_SOURCES = $(REF_GL) rw_in_svgalib.c gl_fxmesa.c +# 3dFX +#ref_fxgl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c -#ref_sdlgl_so_SOURCES = $(REF_GL) rw_sdl.c +# SDL +#ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c + +REF_SOFT_COMMON = \ + r_aclip.c \ + r_alias.c \ + r_bsp.c \ + r_draw.c \ + r_edge.c \ + r_image.c \ + r_light.c \ + r_main.c \ + r_misc.c \ + r_model.c \ + r_part.c \ + r_poly.c \ + r_polyse.c \ + r_rast.c \ + r_scan.c \ + r_sprite.c \ + r_surf.c \ + q_shared.c \ + q_sh.c \ + glob.c + +REF_SOFT_ASM = \ + r_aclipa.S \ + r_draw16.S \ + r_drawa.S \ + r_edgea.S \ + r_scana.S \ + r_spr8.S\ + r_surf8.S \ + math.S \ + d_polysa.S \ + r_varsa.S \ + sys_dosa.S + +# SVGAlib +#ref_soft_so_SOURCES = $(REF_SOFT_COMMON) rw_svgalib.c rw_in_svgalib.c d_copy.S + +# X11 +ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c + +# SDL +#ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c + +$(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ + $(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS) + +$(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ + $(REF_SOFT_X11_OBJS) $(XLDFLAGS) + +$(BUILDDIR)/ref_softsdl.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SDL_OBJS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \ + $(REF_SOFT_SDL_OBJS) $(SDLLDFLAGS) AM_CFLAGS = -Wall -Werror -pipe AM_CPPFLAGS = -Dstricmp=strcasecmp -I../game -ref_glx_so_CFLAGS = -fPIC -ref_glx_so_LDFLAGS = -shared +ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include +ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -#ref_fxgl_so_CFLAGS = -fPIC -#ref_fxgl_so_LDFLAGS = -shared +#ref_fxgl_so_CFLAGS = -fPIC -I/usr/X11R6/include +#ref_fxgl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga -#ref_sdlgl_so_CFLAGS = -fPIC -#ref_sdlgl_so_LDFLAGS = -shared +#ref_sdlgl_so_CFLAGS = -fPIC $(shell sdl-config --cflags) -DOPENGL +#ref_sdlgl_so_LDFLAGS = -shared $(shell sdl-config --libs) + +#ref_soft_so_CFLAGS = -fPIC +#ref_soft_so_LDFLAGS = -shared -lvga + +ref_softx_so_CFLAGS = -fPIC -I/usr/X11R6/include +ref_softx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm + +#ref_softsdl_so_CFLAGS = -fPIC $(shell sdl-config --cflags) +#ref_softsdl_so_LDFLAGS = -shared $(shell sdl-config --libs) diff --git a/src/adivtab.h b/src/adivtab.h index 812a8e1..c42bf76 100644 --- a/src/adivtab.h +++ b/src/adivtab.h @@ -1,4 +1,25 @@ -// table of quotients and remainders for [-15...16] / [-15...16] +/* $Id$ + * + * table of quotients and remainders for [-15...16] / [-15...16] + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * 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. + */ // numerator = -15 {1, 0}, diff --git a/ref_soft/asm_draw.h b/src/asm_draw.h similarity index 100% rename from ref_soft/asm_draw.h rename to src/asm_draw.h diff --git a/ref_soft/block16.inc b/src/block16.inc similarity index 100% rename from ref_soft/block16.inc rename to src/block16.inc diff --git a/ref_soft/block8.inc b/src/block8.inc similarity index 100% rename from ref_soft/block8.inc rename to src/block8.inc diff --git a/ref_soft/d_copy.S b/src/d_copy.S similarity index 100% rename from ref_soft/d_copy.S rename to src/d_copy.S diff --git a/ref_soft/d_if.inc b/src/d_if.inc similarity index 100% rename from ref_soft/d_if.inc rename to src/d_if.inc diff --git a/src/d_ifacea.h b/src/d_ifacea.h index f15c8cd..a611017 100644 --- a/src/d_ifacea.h +++ b/src/d_ifacea.h @@ -1,27 +1,25 @@ -/* -Copyright (C) 1997-2001 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. - -*/ -// -// d_ifacea.h -// -// Include file for asm driver interface. -// +/* $Id$ + * + * Include file for asm driver interface. + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * 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. + */ // // !!! note that this file must match the corresponding C structures in @@ -39,8 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // !!! if this is changed, it must be changed in r_shared.h too !!! #define MAXHEIGHT 1024 +/* #define MAXHEIGHT 1200 -- from ref_soft definition */ -// !!! if this is changed, it must be changed in quakedef.h too !!! +// !!! if this is changed, it must be changed in quakedef.h too !!! (or qcommon.h) #define CACHE_SIZE 32 // used to align key data structures // particle_t structure diff --git a/ref_soft/d_polysa.S b/src/d_polysa.S similarity index 100% rename from ref_soft/d_polysa.S rename to src/d_polysa.S diff --git a/ref_soft/math.S b/src/math.S similarity index 100% rename from ref_soft/math.S rename to src/math.S diff --git a/ref_soft/qasm.inc b/src/qasm.inc similarity index 100% rename from ref_soft/qasm.inc rename to src/qasm.inc diff --git a/ref_soft/r_aclip.c b/src/r_aclip.c similarity index 100% rename from ref_soft/r_aclip.c rename to src/r_aclip.c diff --git a/ref_soft/r_aclipa.S b/src/r_aclipa.S similarity index 100% rename from ref_soft/r_aclipa.S rename to src/r_aclipa.S diff --git a/ref_soft/r_aclipa.asm b/src/r_aclipa.asm similarity index 100% rename from ref_soft/r_aclipa.asm rename to src/r_aclipa.asm diff --git a/ref_soft/r_alias.c b/src/r_alias.c similarity index 100% rename from ref_soft/r_alias.c rename to src/r_alias.c diff --git a/ref_soft/r_bsp.c b/src/r_bsp.c similarity index 100% rename from ref_soft/r_bsp.c rename to src/r_bsp.c diff --git a/ref_soft/r_draw.c b/src/r_draw.c similarity index 100% rename from ref_soft/r_draw.c rename to src/r_draw.c diff --git a/ref_soft/r_draw16.S b/src/r_draw16.S similarity index 100% rename from ref_soft/r_draw16.S rename to src/r_draw16.S diff --git a/ref_soft/r_draw16.asm b/src/r_draw16.asm similarity index 100% rename from ref_soft/r_draw16.asm rename to src/r_draw16.asm diff --git a/ref_soft/r_drawa.S b/src/r_drawa.S similarity index 100% rename from ref_soft/r_drawa.S rename to src/r_drawa.S diff --git a/ref_soft/r_drawa.asm b/src/r_drawa.asm similarity index 100% rename from ref_soft/r_drawa.asm rename to src/r_drawa.asm diff --git a/ref_soft/r_edge.c b/src/r_edge.c similarity index 100% rename from ref_soft/r_edge.c rename to src/r_edge.c diff --git a/ref_soft/r_edgea.S b/src/r_edgea.S similarity index 100% rename from ref_soft/r_edgea.S rename to src/r_edgea.S diff --git a/ref_soft/r_edgea.asm b/src/r_edgea.asm similarity index 100% rename from ref_soft/r_edgea.asm rename to src/r_edgea.asm diff --git a/ref_soft/r_image.c b/src/r_image.c similarity index 100% rename from ref_soft/r_image.c rename to src/r_image.c diff --git a/ref_soft/r_light.c b/src/r_light.c similarity index 100% rename from ref_soft/r_light.c rename to src/r_light.c diff --git a/ref_soft/r_local.h b/src/r_local.h similarity index 96% rename from ref_soft/r_local.h rename to src/r_local.h index c9060e7..e631481 100644 --- a/ref_soft/r_local.h +++ b/src/r_local.h @@ -1,22 +1,23 @@ -/* -Copyright (C) 1997-2001 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. - -*/ +/* $Id$ + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * 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. + */ #include #include @@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "../client/ref.h" +#include "ref.h" #define REF_VERSION "SOFT 0.01" diff --git a/ref_soft/r_main.c b/src/r_main.c similarity index 100% rename from ref_soft/r_main.c rename to src/r_main.c diff --git a/ref_soft/r_misc.c b/src/r_misc.c similarity index 100% rename from ref_soft/r_misc.c rename to src/r_misc.c diff --git a/ref_soft/r_model.c b/src/r_model.c similarity index 100% rename from ref_soft/r_model.c rename to src/r_model.c diff --git a/ref_soft/r_model.h b/src/r_model.h similarity index 100% rename from ref_soft/r_model.h rename to src/r_model.h diff --git a/ref_soft/r_part.c b/src/r_part.c similarity index 100% rename from ref_soft/r_part.c rename to src/r_part.c diff --git a/ref_soft/r_poly.c b/src/r_poly.c similarity index 100% rename from ref_soft/r_poly.c rename to src/r_poly.c diff --git a/ref_soft/r_polysa.asm b/src/r_polysa.asm similarity index 100% rename from ref_soft/r_polysa.asm rename to src/r_polysa.asm diff --git a/ref_soft/r_polyse.c b/src/r_polyse.c similarity index 100% rename from ref_soft/r_polyse.c rename to src/r_polyse.c diff --git a/ref_soft/r_rast.c b/src/r_rast.c similarity index 100% rename from ref_soft/r_rast.c rename to src/r_rast.c diff --git a/ref_soft/r_scan.c b/src/r_scan.c similarity index 100% rename from ref_soft/r_scan.c rename to src/r_scan.c diff --git a/ref_soft/r_scana.S b/src/r_scana.S similarity index 100% rename from ref_soft/r_scana.S rename to src/r_scana.S diff --git a/ref_soft/r_scana.asm b/src/r_scana.asm similarity index 100% rename from ref_soft/r_scana.asm rename to src/r_scana.asm diff --git a/ref_soft/r_spr8.S b/src/r_spr8.S similarity index 100% rename from ref_soft/r_spr8.S rename to src/r_spr8.S diff --git a/ref_soft/r_spr8.asm b/src/r_spr8.asm similarity index 100% rename from ref_soft/r_spr8.asm rename to src/r_spr8.asm diff --git a/ref_soft/r_sprite.c b/src/r_sprite.c similarity index 100% rename from ref_soft/r_sprite.c rename to src/r_sprite.c diff --git a/ref_soft/r_surf.c b/src/r_surf.c similarity index 100% rename from ref_soft/r_surf.c rename to src/r_surf.c diff --git a/ref_soft/r_surf8.S b/src/r_surf8.S similarity index 100% rename from ref_soft/r_surf8.S rename to src/r_surf8.S diff --git a/ref_soft/r_surf8.asm b/src/r_surf8.asm similarity index 100% rename from ref_soft/r_surf8.asm rename to src/r_surf8.asm diff --git a/ref_soft/r_varsa.S b/src/r_varsa.S similarity index 100% rename from ref_soft/r_varsa.S rename to src/r_varsa.S diff --git a/ref_soft/r_varsa.asm b/src/r_varsa.asm similarity index 100% rename from ref_soft/r_varsa.asm rename to src/r_varsa.asm diff --git a/ref_soft/rand1k.h b/src/rand1k.h similarity index 100% rename from ref_soft/rand1k.h rename to src/rand1k.h diff --git a/ref_soft/ref_soft.def b/src/ref_soft.def similarity index 100% rename from ref_soft/ref_soft.def rename to src/ref_soft.def diff --git a/ref_soft/ref_soft.dsp b/src/ref_soft.dsp similarity index 100% rename from ref_soft/ref_soft.dsp rename to src/ref_soft.dsp diff --git a/src/rw_x11.c b/src/rw_x11.c index 9e01ff2..493e40d 100644 --- a/src/rw_x11.c +++ b/src/rw_x11.c @@ -1,22 +1,24 @@ -/* -Copyright (C) 1997-2001 Id Software, Inc. +/* $Id$ + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * 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 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. - -*/ /* ** RW_X11.C ** @@ -51,8 +53,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#include "../ref_soft/r_local.h" -#include "../client/keys.h" +#include "r_local.h" +#include "keys.h" #include "rw.h" /*****************************************************************************/