301
|
1 |
--- AssaultCube/source/src/renderhud.cpp.orig 2007-06-05 19:58:47.757027557 +0700
|
|
2 |
+++ AssaultCube/source/src/renderhud.cpp 2007-06-05 19:59:21.560872172 +0700
|
|
3 |
@@ -4,7 +4,7 @@
|
|
4 |
|
|
5 |
void drawicon(Texture *tex, float x, float y, float s, int col, int row, float ts)
|
|
6 |
{
|
|
7 |
- if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts);
|
|
8 |
+ if(tex && tex->xs == tex->ys) a_quad(tex->id, x, y, s, ts*col, ts*row, ts);
|
|
9 |
}
|
|
10 |
|
|
11 |
void drawequipicon(float x, float y, int col, int row, float blend)
|
|
12 |
@@ -177,7 +177,7 @@
|
|
13 |
if(showmap)
|
|
14 |
{
|
|
15 |
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
|
|
16 |
- quad(minimaptex, 0, 0, radarviewsize, (centerpos.x-res/2)/worldsize, (centerpos.y-res/2)/worldsize, res/worldsize);
|
|
17 |
+ a_quad(minimaptex, 0, 0, radarviewsize, (centerpos.x-res/2)/worldsize, (centerpos.y-res/2)/worldsize, res/worldsize);
|
|
18 |
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
19 |
glDisable(GL_BLEND);
|
|
20 |
}
|
|
21 |
@@ -225,7 +225,7 @@
|
|
22 |
glColor3f(1, 1, 1);
|
|
23 |
static Texture *overlaytex = NULL;
|
|
24 |
if(!overlaytex) overlaytex = textureload("packages/misc/radaroverlays.png", 3);
|
|
25 |
- quad(overlaytex->id, VIRTW-overlaysize-10, 10, overlaysize, m_teammode ? 0.5f*team_int(player1->team) : 0, m_teammode ? 0 : 0.5f, 0.5f, 0.5f);
|
|
26 |
+ a_quad(overlaytex->id, VIRTW-overlaysize-10, 10, overlaysize, m_teammode ? 0.5f*team_int(player1->team) : 0, m_teammode ? 0 : 0.5f, 0.5f, 0.5f);
|
|
27 |
glEnable(GL_CULL_FACE);
|
|
28 |
}
|
|
29 |
}
|
|
30 |
@@ -237,7 +237,7 @@
|
|
31 |
glColor3f(1, 1, 1);
|
|
32 |
static Texture *icons = NULL;
|
|
33 |
if(!icons) icons = textureload("packages/misc/teamicons.png");
|
|
34 |
- quad(icons->id, VIRTW-VIRTH/12-10, 10, VIRTH/12, team_int(player1->team) ? 0.5f : 0, 0, 0.5f, 0.5f);
|
|
35 |
+ a_quad(icons->id, VIRTW-VIRTH/12-10, 10, VIRTH/12, team_int(player1->team) ? 0.5f : 0, 0, 0.5f, 0.5f);
|
|
36 |
glEnable(GL_CULL_FACE);
|
|
37 |
}
|
|
38 |
|
|
39 |
@@ -410,7 +410,7 @@
|
|
40 |
loopi(fmt ? 1 : 2)
|
|
41 |
{
|
|
42 |
glClear(GL_COLOR_BUFFER_BIT);
|
|
43 |
- quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
|
|
44 |
+ a_quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
|
|
45 |
if(fmt)
|
|
46 |
{
|
|
47 |
glEnable(GL_BLEND);
|
|
48 |
--- AssaultCube/source/src/protos.h.orig 2007-06-05 19:58:15.342674093 +0700
|
|
49 |
+++ AssaultCube/source/src/protos.h 2007-06-05 19:58:17.823304475 +0700
|
|
50 |
@@ -61,7 +61,7 @@
|
|
51 |
extern void dot(int x, int y, float z);
|
|
52 |
extern void linestyle(float width, int r, int g, int b);
|
|
53 |
extern void blendbox(int x1, int y1, int x2, int y2, bool border, int tex = -1);
|
|
54 |
-extern void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy = 0);
|
|
55 |
+extern void a_quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy = 0);
|
|
56 |
extern void circle(GLuint tex, float x, float y, float r, float tx, float ty, float tr, int subdiv = 32);
|
|
57 |
extern void gl_drawframe(int w, int h, float changelod, float curfps);
|
|
58 |
extern void clearminimap();
|
|
59 |
--- AssaultCube/source/src/rendergl.cpp.orig 2007-06-05 19:58:03.463233585 +0700
|
|
60 |
+++ AssaultCube/source/src/rendergl.cpp 2007-06-05 19:58:17.822921121 +0700
|
|
61 |
@@ -108,7 +108,7 @@
|
|
62 |
xtraverts += 4;
|
|
63 |
}
|
|
64 |
|
|
65 |
-void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy)
|
|
66 |
+void a_quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy)
|
|
67 |
{
|
|
68 |
if(!tsy) tsy = tsx;
|
|
69 |
glBindTexture(GL_TEXTURE_2D, tex);
|