1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
|
From 752950989b4e286459ca9aee3d61a868d7b20fa4 Mon Sep 17 00:00:00 2001
From: ac-stef <ac_stef@users.sf.net>
Date: Sat, 27 Feb 2016 21:28:23 +0100
Subject: [PATCH] fix some errors and warnings for GCC 6
* do not use std::abs() because math.h includes one, that converts ints
to double. Use own iabs(), which directly uses labs() instead.
* don't use the word "gamma" as name for variables
* don't use a homebrew round() function
---
source/src/bot/bot_waypoint.cpp | 12 ++++++------
source/src/command.cpp | 2 +-
source/src/command.h | 1 +
source/src/crypto.cpp | 2 +-
source/src/editing.cpp | 6 +++---
source/src/entity.h | 2 +-
source/src/main.cpp | 8 ++++----
source/src/platform.h | 9 +--------
source/src/protos.h | 3 ++-
source/src/rendercubes.cpp | 8 ++++----
source/src/rendertext.cpp | 4 ++--
source/src/tools.h | 3 +--
source/src/world.cpp | 6 +++---
source/src/worldocull.cpp | 2 +-
source/src/worldrender.cpp | 4 ++--
15 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/source/src/bot/bot_waypoint.cpp b/source/src/bot/bot_waypoint.cpp
index 520c686..7b265ef 100644
--- a/source/src/bot/bot_waypoint.cpp
+++ b/source/src/bot/bot_waypoint.cpp
@@ -1221,7 +1221,7 @@ void CWaypointClass::CalcCost(node_s *pNode)
flCost += (1.0f-flFraction)*0.5f;
}
- if ((abs(a) > 4) || (abs(b) > 4)) continue;
+ if ((iabs(a) > 4) || (iabs(b) > 4)) continue;
vec from = to;
to.z -= (JUMP_HEIGHT - 1.0f);
@@ -1249,7 +1249,7 @@ void CWaypointClass::CalcCost(node_s *pNode)
flCost += (1.0f-flFraction)*0.5f;
}
- if ((abs(a) > 4) || (abs(b) > 4)) continue;
+ if ((iabs(a) > 4) || (iabs(b) > 4)) continue;
vec from = to;
to.z -= (JUMP_HEIGHT - 1.0f);
@@ -1671,12 +1671,12 @@ node_s *CWaypointClass::GetNearestTriggerFloodWP(vec v_origin, float flRange)
void CWaypointClass::GetNodeIndexes(const vec &v_origin, short *i, short *j)
{
// Function code by cheesy and PMB
- //*i = abs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE));
- //*j = abs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE));
+ //*i = iabs((int)((int)(v_origin.x + (2*ssize)) / SECTOR_SIZE));
+ //*j = iabs((int)((int)(v_origin.y + (2*ssize)) / SECTOR_SIZE));
//*i = (int)((v_origin.x) / ssize * MAX_MAP_GRIDS);
//*j = (int)((v_origin.y) / ssize * MAX_MAP_GRIDS);
- *i = abs((int)((v_origin.x) / MAX_MAP_GRIDS));
- *j = abs((int)((v_origin.y) / MAX_MAP_GRIDS));
+ *i = iabs((int)((v_origin.x) / MAX_MAP_GRIDS));
+ *j = iabs((int)((v_origin.y) / MAX_MAP_GRIDS));
if (*i > MAX_MAP_GRIDS - 1)
*i = MAX_MAP_GRIDS - 1;
diff --git a/source/src/command.cpp b/source/src/command.cpp
index 668f3bf..2a5c90d 100644
--- a/source/src/command.cpp
+++ b/source/src/command.cpp
@@ -499,7 +499,7 @@ char *executeret(const char *p) // all evaluation hap
if(lc<=seer_t1.length())
{
int dt = seer_t1[seer_index] - seer_t1[lc];
- if(abs(dt)<2)
+ if(iabs(dt)<2)
{
conoutf("SCRIPT EXECUTION warning [%d:%s]", &p, p);
seer_t2.add(seer_t1[seer_index]);
diff --git a/source/src/command.h b/source/src/command.h
index a3ca68a..2a3de0c 100644
--- a/source/src/command.h
+++ b/source/src/command.h
@@ -86,6 +86,7 @@ enum { IEXC_CORE = 0, IEXC_CFG, IEXC_PROMPT, IEXC_MAPCFG, IEXC_MDLCFG, IEXC_NUM
#define VARNP(name, global, min, cur, max) int global = variable(#name, min, cur, max, &global, NULL, true)
#define VARF(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, false)
#define VARFP(name, min, cur, max, body) extern int name; void var_##name() { body; } int name = variable(#name, min, cur, max, &name, var_##name, true)
+#define VARNFP(name, global, min, cur, max, body) extern int global; void var_##name() { body; } int global = variable(#name, min, cur, max, &global, var_##name, true)
#define FVARP(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, true)
#define FVAR(name, min, cur, max) float name = fvariable(#name, min, cur, max, &name, NULL, false)
diff --git a/source/src/crypto.cpp b/source/src/crypto.cpp
index 44041be..0684750 100644
--- a/source/src/crypto.cpp
+++ b/source/src/crypto.cpp
@@ -778,7 +778,7 @@ static const char *hashchunktoa(tiger::chunk h) // portable solution instead o
const char *genpwdhash(const char *name, const char *pwd, int salt)
{
static string temp;
- formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, abs(PROTOCOL_VERSION));
+ formatstring(temp)("%s %d %s %s %d", pwd, salt, name, pwd, iabs(PROTOCOL_VERSION));
tiger::hashval hash;
tiger::hash((uchar *)temp, (int)strlen(temp), hash);
formatstring(temp)("%s %s %s", hashchunktoa(hash.chunks[0]), hashchunktoa(hash.chunks[1]), hashchunktoa(hash.chunks[2]));
diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index 8d5e1ff..745aa98 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -137,11 +137,11 @@ void checkselections()
void makesel(bool isnew)
{
block &cursel = sels.last(); //RR 10/12/12 - FIXEME, error checking should happen with "isnew", not here checking if it really is new.
- if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), abs(lastx-cx)+1, abs(lasty-cy)+1, max(lasth, ch));
+ if(isnew || sels.length() == 0) addselection(min(lastx, cx), min(lasty, cy), iabs(lastx-cx)+1, iabs(lasty-cy)+1, max(lasth, ch));
else
{
cursel.x = min(lastx, cx); cursel.y = min(lasty, cy);
- cursel.xs = abs(lastx-cx)+1; cursel.ys = abs(lasty-cy)+1;
+ cursel.xs = iabs(lastx-cx)+1; cursel.ys = iabs(lasty-cy)+1;
cursel.h = max(lasth, ch);
correctsel(cursel);
}
@@ -849,7 +849,7 @@ void movemap(int xo, int yo, int zo) // move whole map
}
if(xo || yo)
{
- block b = { max(-xo, 0), max(-yo, 0), ssize - abs(xo), ssize - abs(yo) }, *cp = blockcopy(b);
+ block b = { max(-xo, 0), max(-yo, 0), ssize - iabs(xo), ssize - iabs(yo) }, *cp = blockcopy(b);
cp->x = max(xo, 0);
cp->y = max(yo, 0);
blockpaste(*cp);
diff --git a/source/src/entity.h b/source/src/entity.h
index e2ad32d..84ac385 100644
--- a/source/src/entity.h
+++ b/source/src/entity.h
@@ -538,7 +538,7 @@ class playerent : public dynent, public playerstate
{
const int maxskin[2] = { 4, 6 };
t = team_base(t < 0 ? team : t);
- nextskin[t] = abs(s) % maxskin[t];
+ nextskin[t] = iabs(s) % maxskin[t];
}
};
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 0d57c0c..c51cd74 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -519,11 +519,11 @@ void setresdata(char *s, enet_uint32 c)
COMMANDF(screenres, "ii", (int *w, int *h) { screenres(*w, *h); });
static int curgamma = 100;
-VARFP(gamma, 30, 100, 300,
+VARNFP(gamma, vgamma, 30, 100, 300,
{
- if(gamma == curgamma) return;
- curgamma = gamma;
- float f = gamma/100.0f;
+ if(vgamma == curgamma) return;
+ curgamma = vgamma;
+ float f = vgamma/100.0f;
if(SDL_SetGamma(f,f,f)==-1) conoutf("Could not set gamma: %s", SDL_GetError());
});
diff --git a/source/src/platform.h b/source/src/platform.h
index aece7e2..fd2eef1 100644
--- a/source/src/platform.h
+++ b/source/src/platform.h
@@ -2,14 +2,6 @@
#ifdef _FORTIFY_SOURCE
#undef _FORTIFY_SOURCE
#endif
-
- #define gamma __gamma
-#endif
-
-#include <math.h>
-
-#ifdef __GNUC__
- #undef gamma
#endif
#include <string.h>
@@ -19,6 +11,7 @@
#include <ctype.h>
#include <time.h>
#include <limits.h>
+#include <math.h>
#ifdef __GNUC__
#include <new>
#include <signal.h>
diff --git a/source/src/protos.h b/source/src/protos.h
index 1c07fad..97b0ee0 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -1053,7 +1053,8 @@ struct servercommandline
{
demo_interm = true;
}
- else if(ai > 0) maxdemos = ai; break;
+ else if(ai > 0) maxdemos = ai;
+ break;
}
case 'W': demopath = a; break;
case 'r': maprot = a; break;
diff --git a/source/src/rendercubes.cpp b/source/src/rendercubes.cpp
index 1940da8..2be7fb0 100644
--- a/source/src/rendercubes.cpp
+++ b/source/src/rendercubes.cpp
@@ -216,9 +216,9 @@ void render_flat(int wtex, int x, int y, int size, int h, sqr *l1, sqr *l4, sqr
else // continue strip
{
int lighterr = lighterror*2;
- if((abs(ol1r-l3->r)<lighterr && abs(ol2r-l4->r)<lighterr // skip vertices if light values are close enough
- && abs(ol1g-l3->g)<lighterr && abs(ol2g-l4->g)<lighterr
- && abs(ol1b-l3->b)<lighterr && abs(ol2b-l4->b)<lighterr) || !wtex)
+ if((iabs(ol1r-l3->r)<lighterr && iabs(ol2r-l4->r)<lighterr // skip vertices if light values are close enough
+ && iabs(ol1g-l3->g)<lighterr && iabs(ol2g-l4->g)<lighterr
+ && iabs(ol1b-l3->b)<lighterr && iabs(ol2b-l4->b)<lighterr) || !wtex)
{
verts.setsize(verts.length()-2);
nquads--;
@@ -375,7 +375,7 @@ void render_square(int wtex, float floor1, float floor2, float ceil1, float ceil
{
int lighterr = lighterror*2;
if((!hf && !ohf)
- && ((abs(ol1r-l2->r)<lighterr && abs(ol1g-l2->g)<lighterr && abs(ol1b-l2->b)<lighterr) || !wtex)) // skip vertices if light values are close enough
+ && ((iabs(ol1r-l2->r)<lighterr && iabs(ol1g-l2->g)<lighterr && iabs(ol1b-l2->b)<lighterr) || !wtex)) // skip vertices if light values are close enough
{
verts.setsize(verts.length()-2);
nquads--;
diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp
index 0ed23af..b55da4f 100644
--- a/source/src/rendertext.cpp
+++ b/source/src/rendertext.cpp
@@ -330,7 +330,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
if(c=='r') c = stack[(sp > 0) ? --sp : sp]; // restore color
else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed
else stack[sp] = c;
- switch(abs(stack[sp]))
+ switch(iabs(stack[sp]))
{
case '0': color = bvec( 2, 255, 128 ); break; // green: player talk
case '1': color = bvec( 96, 160, 255 ); break; // blue: team chat
@@ -380,7 +380,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
//default: color = bvec( 255, 255, 255 ); break;
}
int b = (int) (sinf(lastmillis / 200.0f) * 115.0f);
- b = stack[sp] > 0 ? 100 : min(abs(b), 100);
+ b = stack[sp] > 0 ? 100 : min(iabs(b), 100);
glColor4ub(color.x, color.y, color.z, (a * b) / 100);
}
}
diff --git a/source/src/tools.h b/source/src/tools.h
index 0aeacff..9eb5a38 100644
--- a/source/src/tools.h
+++ b/source/src/tools.h
@@ -54,8 +54,7 @@ static inline T min(T a, T b)
{
return a < b ? a : b;
}
-
-static inline float round(float x) { return floor(x + 0.5f); }
+inline int iabs(int n) { return labs(n); }
#define clamp(a,b,c) (max(b, min(a, c)))
#define rnd(x) ((int)(randomMT()&0xFFFFFF)%(x))
diff --git a/source/src/world.cpp b/source/src/world.cpp
index 6a1c7bb..99a70eb 100644
--- a/source/src/world.cpp
+++ b/source/src/world.cpp
@@ -79,9 +79,9 @@ void remip(const block &b, int level)
|| o[i]->ceil!=o[3]->ceil
|| o[i]->ftex!=o[3]->ftex
|| o[i]->ctex!=o[3]->ctex
- || abs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal
- || abs(o[i+1]->g-o[0]->g)>lighterr
- || abs(o[i+1]->b-o[0]->b)>lighterr
+ || iabs(o[i+1]->r-o[0]->r)>lighterr // perfect mip even if light is not exactly equal
+ || iabs(o[i+1]->g-o[0]->g)>lighterr
+ || iabs(o[i+1]->b-o[0]->b)>lighterr
|| o[i]->utex!=o[3]->utex
|| o[i]->wtex!=o[3]->wtex) goto c;
}
diff --git a/source/src/worldrender.cpp b/source/src/worldrender.cpp
index 8fd3104..45aa606 100644
--- a/source/src/worldrender.cpp
+++ b/source/src/worldrender.cpp
@@ -297,10 +297,10 @@ void distlod(int &low, int &high, int angle, float widef)
void render_world(float vx, float vy, float vh, float changelod, int yaw, int pitch, float fov, float fovy, int w, int h)
{
loopi(LARGEST_FACTOR) stats[i] = 0;
- min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+abs(pitch)/12;
+ min_lod = minimap || (player1->isspectating() && player1->spectatemode == SM_OVERVIEW) ? MAX_LOD : MIN_LOD+iabs(pitch)/12;
yaw = 360-yaw;
float widef = fov/75.0f;
- int cdist = abs(yaw%90-45);
+ int cdist = iabs(yaw%90-45);
if(cdist<7) // hack to avoid popup at high fovs at 45 yaw
{
min_lod = max(min_lod, (int)(MIN_LOD+(10-cdist)/1.0f*widef)); // less if lod worked better
|
