|
2142
|
1 |
--- AssaultCube_v1.0.2/source/src/protos.h.orig 2009-06-16 20:51:25.000000000 +0100
|
|
|
2 |
+++ AssaultCube_v1.0.2/source/src/protos.h 2009-09-06 07:37:23.298887947 +0100
|
|
|
3 |
@@ -244,8 +244,8 @@
|
|
|
4 |
extern void dot(int x, int y, float z);
|
|
|
5 |
extern void linestyle(float width, int r, int g, int b);
|
|
|
6 |
extern void blendbox(int x1, int y1, int x2, int y2, bool border, int tex = -1, color *c = NULL);
|
|
|
7 |
-extern void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy = 0);
|
|
|
8 |
-extern void quad(GLuint tex, vec &c1, vec &c2, float tx, float ty, float tsx, float tsy);
|
|
|
9 |
+extern void a_quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy = 0);
|
|
|
10 |
+extern void a_quad(GLuint tex, vec &c1, vec &c2, float tx, float ty, float tsx, float tsy);
|
|
|
11 |
extern void circle(GLuint tex, float x, float y, float r, float tx, float ty, float tr, int subdiv = 32);
|
|
|
12 |
extern void setperspective(float fovy, float aspect, float nearplane, float farplane);
|
|
|
13 |
extern void sethudgunperspective(bool on);
|
|
|
14 |
--- AssaultCube_v1.0.2/source/src/rendergl.cpp.orig 2009-03-25 15:18:57.000000000 +0000
|
|
|
15 |
+++ AssaultCube_v1.0.2/source/src/rendergl.cpp 2009-09-06 07:38:21.974212616 +0100
|
|
|
16 |
@@ -215,7 +215,7 @@
|
|
|
17 |
xtraverts += 4;
|
|
|
18 |
}
|
|
|
19 |
|
|
|
20 |
-void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy)
|
|
|
21 |
+void a_quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy)
|
|
|
22 |
{
|
|
|
23 |
if(!tsy) tsy = tsx;
|
|
|
24 |
glBindTexture(GL_TEXTURE_2D, tex);
|
|
|
25 |
@@ -228,7 +228,7 @@
|
|
|
26 |
xtraverts += 4;
|
|
|
27 |
}
|
|
|
28 |
|
|
|
29 |
-void quad(GLuint tex, const vec &c1, const vec &c2, float tx, float ty, float tsx, float tsy)
|
|
|
30 |
+void a_quad(GLuint tex, const vec &c1, const vec &c2, float tx, float ty, float tsx, float tsy)
|
|
|
31 |
{
|
|
|
32 |
if(!tsy) tsy = tsx;
|
|
|
33 |
glBindTexture(GL_TEXTURE_2D, tex);
|
|
|
34 |
@@ -383,7 +383,7 @@
|
|
|
35 |
static Texture *tex = NULL;
|
|
|
36 |
if(!tex) tex = textureload("packages/misc/com.png");
|
|
|
37 |
float s = aboveheadiconsize/100.0f;
|
|
|
38 |
- quad(tex->id, vec(s/2.0f, 0.0f, s), vec(s/-2.0f, 0.0f, 0.0f), 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
39 |
+ a_quad(tex->id, vec(s/2.0f, 0.0f, s), vec(s/-2.0f, 0.0f, 0.0f), 0.0f, 0.0f, 1.0f, 1.0f);
|
|
|
40 |
glDisable(GL_BLEND);
|
|
|
41 |
glPopMatrix();
|
|
|
42 |
}
|
|
|
43 |
--- AssaultCube_v1.0.2/source/src/renderhud.cpp.orig 2009-04-26 19:39:33.000000000 +0100
|
|
|
44 |
+++ AssaultCube_v1.0.2/source/src/renderhud.cpp 2009-09-06 07:36:29.896088206 +0100
|
|
|
45 |
@@ -5,7 +5,7 @@
|
|
301
|
46 |
|
|
|
47 |
void drawicon(Texture *tex, float x, float y, float s, int col, int row, float ts)
|
|
|
48 |
{
|
|
|
49 |
- if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts);
|
|
|
50 |
+ if(tex && tex->xs == tex->ys) a_quad(tex->id, x, y, s, ts*col, ts*row, ts);
|
|
|
51 |
}
|
|
|
52 |
|
|
|
53 |
void drawequipicon(float x, float y, int col, int row, float blend)
|
|
2142
|
54 |
@@ -391,7 +391,7 @@
|
|
|
55 |
if(showmap)
|
|
301
|
56 |
{
|
|
|
57 |
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR);
|
|
|
58 |
- quad(minimaptex, 0, 0, radarviewsize, (centerpos.x-res/2)/worldsize, (centerpos.y-res/2)/worldsize, res/worldsize);
|
|
|
59 |
+ a_quad(minimaptex, 0, 0, radarviewsize, (centerpos.x-res/2)/worldsize, (centerpos.y-res/2)/worldsize, res/worldsize);
|
|
|
60 |
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
61 |
glDisable(GL_BLEND);
|
|
|
62 |
}
|
|
2142
|
63 |
@@ -456,7 +456,7 @@
|
|
301
|
64 |
glColor3f(1, 1, 1);
|
|
2142
|
65 |
static Texture *bordertex = NULL;
|
|
|
66 |
if(!bordertex) bordertex = textureload("packages/misc/compass-base.png", 3);
|
|
|
67 |
- quad(bordertex->id, VIRTW-10-VIRTH/28-overlaysize, 10+VIRTH/52, overlaysize, 0, 0, 1, 1);
|
|
|
68 |
+ a_quad(bordertex->id, VIRTW-10-VIRTH/28-overlaysize, 10+VIRTH/52, overlaysize, 0, 0, 1, 1);
|
|
|
69 |
if(!hidecompass)
|
|
|
70 |
{
|
|
|
71 |
static Texture *compasstex = NULL;
|
|
|
72 |
@@ -464,7 +464,7 @@
|
|
|
73 |
glPushMatrix();
|
|
|
74 |
glTranslatef(VIRTW-10-VIRTH/28-overlaysize/2, 10+VIRTH/52+overlaysize/2, 0);
|
|
|
75 |
glRotatef(-camera1->yaw, 0, 0, 1);
|
|
|
76 |
- quad(compasstex->id, -overlaysize/2, -overlaysize/2, overlaysize, 0, 0, 1, 1);
|
|
|
77 |
+ a_quad(compasstex->id, -overlaysize/2, -overlaysize/2, overlaysize, 0, 0, 1, 1);
|
|
|
78 |
glPopMatrix();
|
|
|
79 |
}
|
|
301
|
80 |
}
|
|
2142
|
81 |
@@ -476,7 +476,7 @@
|
|
301
|
82 |
glColor3f(1, 1, 1);
|
|
|
83 |
static Texture *icons = NULL;
|
|
2142
|
84 |
if(!icons) icons = textureload("packages/misc/teamicons.png", 3);
|
|
|
85 |
- quad(icons->id, VIRTW-VIRTH/12-10, 10, VIRTH/12, team_int(player1->team) ? 0.5f : 0, 0, 0.49f, 1.0f);
|
|
|
86 |
+ a_quad(icons->id, VIRTW-VIRTH/12-10, 10, VIRTH/12, team_int(player1->team) ? 0.5f : 0, 0, 0.49f, 1.0f);
|
|
301
|
87 |
}
|
|
|
88 |
|
|
2142
|
89 |
int damageblendmillis = 0;
|
|
|
90 |
@@ -717,7 +717,7 @@
|
|
301
|
91 |
loopi(fmt ? 1 : 2)
|
|
|
92 |
{
|
|
|
93 |
glClear(GL_COLOR_BUFFER_BIT);
|
|
|
94 |
- quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
|
|
|
95 |
+ a_quad(logo->id, (VIRTW-VIRTH)/2, 0, VIRTH, 0, 0, 1);
|
|
|
96 |
if(fmt)
|
|
|
97 |
{
|
|
|
98 |
glEnable(GL_BLEND);
|