-
Notifications
You must be signed in to change notification settings - Fork 3
/
up_down_hover.patch
163 lines (144 loc) · 5.69 KB
/
up_down_hover.patch
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
Index: src/engine/physics.cpp
===================================================================
--- src/engine/physics.cpp (revision 6518)
+++ src/engine/physics.cpp (working copy)
@@ -1545,30 +1545,18 @@
COMMAND(phystest, "");
-void vecfromyawpitch(float yaw, float pitch, int move, int strafe, vec &m)
+void vecfromyawpitch(float yaw, float pitch, int move, int strafe, int vertical, vec &m)
{
- if(move)
- {
- m.x = move*-sinf(RAD*yaw);
- m.y = move*cosf(RAD*yaw);
+ m.x = move*-sinf(RAD*yaw)*cosf(RAD*pitch) + vertical*-sinf(RAD*pitch)*-sinf(RAD*yaw) + strafe*cosf(RAD*yaw);
+ m.y = move* cosf(RAD*yaw)*cosf(RAD*pitch) + vertical*-sinf(RAD*pitch)* cosf(RAD*yaw) + strafe*sinf(RAD*yaw);
+ m.z = move* sinf(RAD*pitch) + vertical* cosf(RAD*pitch);
}
- else m.x = m.y = 0;
- if(pitch)
+void vecfromyawpitch(float yaw, float pitch, int move, int strafe, vec &m)
{
- m.x *= cosf(RAD*pitch);
- m.y *= cosf(RAD*pitch);
- m.z = move*sinf(RAD*pitch);
+ vecfromyawpitch(yaw, pitch, move, strafe, 0, m);
}
- else m.z = 0;
- if(strafe)
- {
- m.x += strafe*cosf(RAD*yaw);
- m.y += strafe*sinf(RAD*yaw);
- }
-}
-
void vectoyawpitch(const vec &v, float &yaw, float &pitch)
{
if(v.iszero()) yaw = pitch = 0;
@@ -1613,9 +1601,10 @@
if(!floating && pl->physstate == PHYS_FALL) pl->timeinair = min(pl->timeinair + curtime, 1000);
vec m(0.0f, 0.0f, 0.0f);
- if((pl->move || pl->strafe) && allowmove)
+ if((pl->move || pl->strafe || pl->vertical) && allowmove)
{
- vecfromyawpitch(pl->yaw, floating || water || pl->type==ENT_CAMERA ? pl->pitch : 0, pl->move, pl->strafe, m);
+ bool allowvertical = !pl->hovering && (floating || water || pl->type==ENT_CAMERA);
+ vecfromyawpitch(pl->yaw, allowvertical ? pl->pitch : 0, pl->move, pl->strafe, pl->vertical, m);
if(!floating && pl->physstate >= PHYS_SLOPE)
{
@@ -1686,7 +1675,7 @@
float secs = curtime/1000.f;
// apply gravity
- if(!floating) modifygravity(pl, water, curtime);
+ if(!floating) { pl->vertical = 0; modifygravity(pl, water, curtime); }
// apply any player generated changes in velocity
modifyvelocity(pl, local, water, floating, curtime);
@@ -2011,12 +2000,15 @@
#define dir(name,v,d,s,os) ICOMMAND(name, "D", (int *down), { player->s = *down!=0; player->v = player->s ? d : (player->os ? -(d) : 0); });
-dir(backward, move, -1, k_down, k_up);
-dir(forward, move, 1, k_up, k_down);
+dir(forward, move, 1, k_forward, k_backward);
+dir(backward, move, -1, k_backward, k_forward);
dir(left, strafe, 1, k_left, k_right);
dir(right, strafe, -1, k_right, k_left);
+dir(up, vertical, 1, k_up, k_down);
+dir(down, vertical, -1, k_down, k_up);
ICOMMAND(jump, "D", (int *down), { if(!*down || game::canjump()) player->jumping = *down!=0; });
+ICOMMAND(hover, "D", (int *down), { if(!*down || game::canhover()) player->hovering = *down!=0; });
ICOMMAND(attack, "D", (int *down), { game::doattack(*down!=0); });
bool entinmap(dynent *d, bool avoidplayers) // brute force but effective way to find a free spawn spot in the map
Index: src/fpsgame/fps.cpp
===================================================================
--- src/fpsgame/fps.cpp (revision 6518)
+++ src/fpsgame/fps.cpp (working copy)
@@ -385,6 +385,11 @@
return player1->state!=CS_DEAD;
}
+ bool canhover()
+ {
+ return player1->state==CS_SPECTATOR || player1->state==CS_EDITING;
+ }
+
bool allowmove(physent *d)
{
if(d->type!=ENT_PLAYER) return true;
@@ -445,7 +450,7 @@
}
else
{
- d->move = d->strafe = 0;
+ d->move = d->strafe = d->vertical = 0;
d->resetinterp();
d->smoothmillis = 0;
playsound(S_DIE1+rnd(2), &d->o);
Index: src/shared/ents.h
===================================================================
--- src/shared/ents.h (revision 6518)
+++ src/shared/ents.h (working copy)
@@ -77,8 +77,8 @@
ushort timeinair;
uchar inwater;
- bool jumping;
- schar move, strafe;
+ bool jumping, hovering;
+ schar move, strafe, vertical;
uchar physstate; // one of PHYS_* above
uchar state, editstate; // one of CS_* above
@@ -105,7 +105,8 @@
inwater = 0;
timeinair = 0;
jumping = false;
- strafe = move = 0;
+ hovering = false;
+ strafe = move = vertical =0;
physstate = PHYS_FALL;
vel = falling = vec(0, 0, 0);
floor = vec(0, 0, 1);
@@ -196,7 +197,7 @@
struct dynent : physent // animated characters, or characters that can receive input
{
- bool k_left, k_right, k_up, k_down; // see input code
+ bool k_left, k_right, k_forward, k_backward, k_up, k_down; // see input code
entitylight light;
animinterpinfo animinterp[MAXANIMPARTS];
@@ -220,8 +221,8 @@
void stopmoving()
{
- k_left = k_right = k_up = k_down = jumping = false;
- move = strafe = 0;
+ k_left = k_right = k_forward = k_backward = k_up = k_down = jumping = hovering = false;
+ move = strafe = vertical = 0;
}
void reset()
Index: src/shared/igame.h
===================================================================
--- src/shared/igame.h (revision 6518)
+++ src/shared/igame.h (working copy)
@@ -69,6 +69,7 @@
extern float abovegameplayhud(int w, int h);
extern void gameplayhud(int w, int h);
extern bool canjump();
+ extern bool canhover();
extern bool allowmove(physent *d);
extern void doattack(bool on);
extern dynent *iterdynents(int i);