Skip to content

Commit 70d6e74

Browse files
winterheartwinterheart
committed
Commenting out non-implemented and unused draw functions
1 parent 187f25e commit 70d6e74

File tree

4 files changed

+90
-76
lines changed

4 files changed

+90
-76
lines changed

Diff for: ‎src/Libraries/2D/Source/2d.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,12 @@ extern grt_uline_fill_table *grd_uline_fill_table;
211211
extern grt_uline_fill_table *grd_uline_fill_table_list[];
212212
extern grt_uline_fill gen_uline_fill_table[][GRD_LINE_TYPES];
213213
extern grt_uline_fill flat8_uline_fill_table[][GRD_LINE_TYPES];
214-
extern grt_uline_fill bank8_uline_fill_table[][GRD_LINE_TYPES];
214+
/*
215+
// WH - not used, see lintab.c
216+
extern grt_uline_fill bank8_uline_fill_table[][GRD_LINE_TYPES];
215217
extern grt_uline_fill bank24_uline_fill_table[][GRD_LINE_TYPES];
216-
extern grt_uline_fill modex_uline_fill_table[][GRD_LINE_TYPES];
218+
extern grt_uline_fill modex_uline_fill_table[][GRD_LINE_TYPES];
219+
*/
217220
extern grt_function_table *grd_function_table_list[];
218221
extern grt_function_table *grd_function_fill_table;
219222
#define gr_init_st(s,p,f) (s)->elem=(p), (s)->flags=(f)

Diff for: ‎src/Libraries/2D/Source/linfcn.h

+65-60
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
/*
22
33
Copyright (C) 2015-2018 Night Dive Studios, LLC.
4+
Copyright (C) 2018-2020 Shockolate Project
45
56
This program is free software: you can redistribute it and/or modify
67
it under the terms of the GNU General Public License as published by
78
the Free Software Foundation, either version 3 of the License, or
89
(at your option) any later version.
9-
10+
1011
This program is distributed in the hope that it will be useful,
1112
but WITHOUT ANY WARRANTY; without even the implied warranty of
1213
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1314
GNU General Public License for more details.
14-
15+
1516
You should have received a copy of the GNU General Public License
1617
along with this program. If not, see <http://www.gnu.org/licenses/>.
17-
18+
1819
*/
19-
/*
20+
/*
2021
* $Source: r:/prj/lib/src/2d/RCS/linfcn.h $
2122
* $Revision: 1.1 $
2223
* $Author: kevin $
@@ -30,67 +31,71 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3031
/* functions living in the tables */
3132

3233
/* all - means that it is a dispatcher */
33-
extern void gri_all_uiline_fill (long, long, grs_vertex *, grs_vertex *);
34+
extern void gri_all_uiline_fill(long, long, grs_vertex *, grs_vertex *);
3435

3536
/* gen is also bank8, bank24 and modex */
36-
extern void gri_gen_uline_fill (long, long, grs_vertex *, grs_vertex *);
37-
extern void gri_gen_uhline_fill (short, short, short, long, long);
38-
extern void gri_gen_uvline_fill (short, short, short, long, long);
39-
extern void gri_gen_usline_fill (long, long, grs_vertex *, grs_vertex *);
40-
extern void gri_gen_ucline_fill (long, long, grs_vertex *, grs_vertex *);
41-
extern void gri_gen_wire_poly_uline (long, long, grs_vertex *, grs_vertex *);
42-
extern void gri_gen_wire_poly_usline (long, long, grs_vertex *, grs_vertex *);
43-
extern void gri_gen_wire_poly_ucline (long, long, grs_vertex *, grs_vertex *);
37+
extern void gri_gen_uline_fill(long, long, grs_vertex *, grs_vertex *);
38+
extern void gri_gen_uhline_fill(short, short, short, long, long);
39+
extern void gri_gen_uvline_fill(short, short, short, long, long);
40+
extern void gri_gen_usline_fill(long, long, grs_vertex *, grs_vertex *);
41+
extern void gri_gen_ucline_fill(long, long, grs_vertex *, grs_vertex *);
42+
extern void gri_gen_wire_poly_uline(long, long, grs_vertex *, grs_vertex *);
43+
// extern void gri_gen_wire_poly_usline(long, long, grs_vertex *, grs_vertex *);
44+
extern void gri_gen_wire_poly_ucline(long, long, grs_vertex *, grs_vertex *);
4445

4546
/* flat8 -- for each line type and fill type */
46-
extern void gri_flat8_uline_ns (long, long, grs_vertex *, grs_vertex *);
47-
extern void gri_flat8_uline_clut (long, long, grs_vertex *, grs_vertex *);
48-
extern void gri_flat8_uline_xor (long, long, grs_vertex *, grs_vertex *);
49-
extern void gri_flat8_uline_blend (long, long, grs_vertex *, grs_vertex *);
50-
51-
extern void gri_flat8_uhline_ns (short, short, short, long, long);
52-
extern void gri_flat8_uhline_clut (short, short, short, long, long);
53-
extern void gri_flat8_uhline_xor (short, short, short, long, long);
54-
extern void gri_flat8_uhline_blend (short, short, short, long, long);
55-
56-
extern void gri_flat8_uvline_ns (short, short, short, long, long);
57-
extern void gri_flat8_uvline_clut (short, short, short, long, long);
58-
extern void gri_flat8_uvline_xor (short, short, short, long, long);
59-
extern void gri_flat8_uvline_blend (short, short, short, long, long);
60-
61-
extern void gri_flat8_ucline_norm (long, long, grs_vertex *, grs_vertex *);
62-
extern void gri_flat8_ucline_clut (long, long, grs_vertex *, grs_vertex *);
63-
extern void gri_flat8_ucline_xor (long, long, grs_vertex *, grs_vertex *);
64-
extern void gri_flat8_ucline_blend (long, long, grs_vertex *, grs_vertex *);
65-
66-
extern void gri_flat8_usline_norm (long, long, grs_vertex *, grs_vertex *);
67-
extern void gri_flat8_usline_clut (long, long, grs_vertex *, grs_vertex *);
68-
extern void gri_flat8_usline_xor (long, long, grs_vertex *, grs_vertex *);
69-
extern void gri_flat8_usline_blend (long, long, grs_vertex *, grs_vertex *);
70-
71-
extern void gri_flat8_wire_poly_uline (long, long, grs_vertex *, grs_vertex *);
72-
extern void gri_flat8_wire_poly_uline_xor (long, long, grs_vertex *, grs_vertex *);
73-
extern void gri_flat8_wire_poly_uline_blend (long, long, grs_vertex *, grs_vertex *);
74-
75-
extern void gri_flat8_wire_poly_usline_norm (long, long, grs_vertex *, grs_vertex *);
76-
extern void gri_flat8_wire_poly_usline_clut (long, long, grs_vertex *, grs_vertex *);
77-
extern void gri_flat8_wire_poly_usline_xor (long, long, grs_vertex *, grs_vertex *);
78-
extern void gri_flat8_wire_poly_usline_blend (long, long, grs_vertex *, grs_vertex *);
79-
80-
extern void gri_flat8_wire_poly_ucline_norm (long, long, grs_vertex *, grs_vertex *);
81-
extern void gri_flat8_wire_poly_ucline_clut (long, long, grs_vertex *, grs_vertex *);
82-
extern void gri_flat8_wire_poly_ucline_xor (long, long, grs_vertex *, grs_vertex *);
83-
extern void gri_flat8_wire_poly_ucline_blend (long, long, grs_vertex *, grs_vertex *);
84-
/* bank8 and modex have their own hlines only */
47+
extern void gri_flat8_uline_ns(long, long, grs_vertex *, grs_vertex *);
48+
extern void gri_flat8_uline_clut(long, long, grs_vertex *, grs_vertex *);
49+
extern void gri_flat8_uline_xor(long, long, grs_vertex *, grs_vertex *);
50+
extern void gri_flat8_uline_blend(long, long, grs_vertex *, grs_vertex *);
51+
52+
extern void gri_flat8_uhline_ns(short, short, short, long, long);
53+
extern void gri_flat8_uhline_clut(short, short, short, long, long);
54+
extern void gri_flat8_uhline_xor(short, short, short, long, long);
55+
extern void gri_flat8_uhline_blend(short, short, short, long, long);
56+
57+
extern void gri_flat8_uvline_ns(short, short, short, long, long);
58+
extern void gri_flat8_uvline_clut(short, short, short, long, long);
59+
extern void gri_flat8_uvline_xor(short, short, short, long, long);
60+
extern void gri_flat8_uvline_blend(short, short, short, long, long);
61+
62+
extern void gri_flat8_ucline_norm(long, long, grs_vertex *, grs_vertex *);
63+
extern void gri_flat8_ucline_clut(long, long, grs_vertex *, grs_vertex *);
64+
extern void gri_flat8_ucline_xor(long, long, grs_vertex *, grs_vertex *);
65+
extern void gri_flat8_ucline_blend(long, long, grs_vertex *, grs_vertex *);
66+
67+
extern void gri_flat8_usline_norm(long, long, grs_vertex *, grs_vertex *);
68+
extern void gri_flat8_usline_clut(long, long, grs_vertex *, grs_vertex *);
69+
extern void gri_flat8_usline_xor(long, long, grs_vertex *, grs_vertex *);
70+
extern void gri_flat8_usline_blend(long, long, grs_vertex *, grs_vertex *);
71+
72+
extern void gri_flat8_wire_poly_uline(long, long, grs_vertex *, grs_vertex *);
73+
// extern void gri_flat8_wire_poly_uline_xor(long, long, grs_vertex *, grs_vertex *);
74+
// extern void gri_flat8_wire_poly_uline_blend(long, long, grs_vertex *, grs_vertex *);
8575

86-
extern void gri_modex_uhline_ns (short, short, short, long, long);
87-
extern void gri_modex_uhline_clut (short, short, short, long, long);
88-
extern void gri_modex_uhline_xor (short, short, short, long, long);
89-
extern void gri_modex_uhline_blend (short, short, short, long, long);
76+
/*
77+
extern void gri_flat8_wire_poly_usline_norm(long, long, grs_vertex *, grs_vertex *);
78+
extern void gri_flat8_wire_poly_usline_clut(long, long, grs_vertex *, grs_vertex *);
79+
extern void gri_flat8_wire_poly_usline_xor(long, long, grs_vertex *, grs_vertex *);
80+
extern void gri_flat8_wire_poly_usline_blend(long, long, grs_vertex *, grs_vertex *);
81+
*/
9082

91-
extern void gri_bank8_uhline_ns (short, short, short, long, long);
92-
extern void gri_bank8_uhline_clut (short, short, short, long, long);
93-
extern void gri_bank8_uhline_xor (short, short, short, long, long);
94-
extern void gri_bank8_uhline_blend (short, short, short, long, long);
83+
extern void gri_flat8_wire_poly_ucline_norm(long, long, grs_vertex *, grs_vertex *);
84+
extern void gri_flat8_wire_poly_ucline_clut(long, long, grs_vertex *, grs_vertex *);
85+
// extern void gri_flat8_wire_poly_ucline_xor(long, long, grs_vertex *, grs_vertex *);
86+
// extern void gri_flat8_wire_poly_ucline_blend(long, long, grs_vertex *, grs_vertex *);
9587

88+
/* bank8 and modex have their own hlines only */
89+
/*
90+
extern void gri_modex_uhline_ns(short, short, short, long, long);
91+
extern void gri_modex_uhline_clut(short, short, short, long, long);
92+
extern void gri_modex_uhline_xor(short, short, short, long, long);
93+
extern void gri_modex_uhline_blend(short, short, short, long, long);
94+
*/
95+
/*
96+
extern void gri_bank8_uhline_ns(short, short, short, long, long);
97+
extern void gri_bank8_uhline_clut(short, short, short, long, long);
98+
extern void gri_bank8_uhline_xor(short, short, short, long, long);
99+
extern void gri_bank8_uhline_blend(short, short, short, long, long);
100+
*/
96101
#endif

Diff for: ‎src/Libraries/2D/Source/lintab.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ grt_uline_fill gen_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
155155
},
156156
};
157157

158-
/* temporarily modex, bank8 and bank24 are all gen's */
158+
/* WH - these tables not used by game
159+
// temporarily modex, bank8 and bank24 are all gen's
159160
grt_uline_fill modex_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
160161
{
161162
gri_gen_uline_fill,
@@ -214,6 +215,7 @@ grt_uline_fill modex_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
214215
},
215216
};
216217
218+
// WH - this too
217219
grt_uline_fill bank8_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
218220
{
219221
gri_gen_uline_fill,
@@ -272,6 +274,7 @@ grt_uline_fill bank8_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
272274
},
273275
};
274276
277+
// WH - and this
275278
grt_uline_fill bank24_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
276279
{
277280
gri_gen_uline_fill,
@@ -329,6 +332,7 @@ grt_uline_fill bank24_uline_fill_table[GRD_FILL_TYPES][GRD_LINE_TYPES] = {
329332
gri_gen_wire_poly_ucline
330333
},
331334
};
335+
*/
332336

333337
grt_uline_fill_table *grd_uline_fill_table_list[] = {
334338
NULL,

Diff for: ‎src/Libraries/2D/Source/lintab.h

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
/*
22
33
Copyright (C) 2015-2018 Night Dive Studios, LLC.
4+
Copyright (C) 2018-2020 Shockolate Project
45
56
This program is free software: you can redistribute it and/or modify
67
it under the terms of the GNU General Public License as published by
78
the Free Software Foundation, either version 3 of the License, or
89
(at your option) any later version.
9-
10+
1011
This program is distributed in the hope that it will be useful,
1112
but WITHOUT ANY WARRANTY; without even the implied warranty of
1213
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1314
GNU General Public License for more details.
14-
15+
1516
You should have received a copy of the GNU General Public License
1617
along with this program. If not, see <http://www.gnu.org/licenses/>.
17-
18+
1819
*/
19-
/*
20+
/*
2021
* $Source: r:/prj/lib/src/2d/RCS/lintab.h $
2122
* $Revision: 1.4 $
2223
* $Author: kevin $
@@ -27,20 +28,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2728
#define __LINTAB_H
2829

2930
#include "line.h"
30-
#include "plytyp.h"
3131
#include "lintyp.h"
32+
#include "plytyp.h"
3233

33-
/* these tables are used in the 2d, but are not visible, except though the
34-
vector (see lintyp.h)
35-
*/
34+
/* these tables are used in the 2d, but are not visible, except though the vector (see lintyp.h) */
3635

3736
extern grt_uline_fill_table *grd_uline_fill_table;
3837
extern grt_uline_fill_table *grd_uline_fill_table_list[];
3938

40-
extern grt_uline_fill gen_uline_fill_table[][GRD_LINE_TYPES];
41-
extern grt_uline_fill flat8_uline_fill_table[][GRD_LINE_TYPES];
42-
extern grt_uline_fill bank8_uline_fill_table[][GRD_LINE_TYPES];
43-
extern grt_uline_fill bank24_uline_fill_table[][GRD_LINE_TYPES];
44-
extern grt_uline_fill modex_uline_fill_table[][GRD_LINE_TYPES];
39+
extern grt_uline_fill gen_uline_fill_table[][GRD_LINE_TYPES];
40+
extern grt_uline_fill flat8_uline_fill_table[][GRD_LINE_TYPES];
4541

42+
/*
43+
// WH - these tables not used by game, see lintab.c
44+
extern grt_uline_fill bank8_uline_fill_table[][GRD_LINE_TYPES];
45+
extern grt_uline_fill bank24_uline_fill_table[][GRD_LINE_TYPES];
46+
extern grt_uline_fill modex_uline_fill_table[][GRD_LINE_TYPES];
47+
*/
4648
#endif

0 commit comments

Comments
 (0)