-
Notifications
You must be signed in to change notification settings - Fork 3
/
credit_overflow.patch
192 lines (183 loc) · 5.45 KB
/
credit_overflow.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
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
Index: src/game/g_client.c
===================================================================
RCS file: /devel/cvs/tremulous/src/game/g_client.c,v
retrieving revision 1.1.1.1.4.2
diff -u -p -r1.1.1.1.4.2 g_client.c
--- src/game/g_client.c 17 Feb 2009 03:30:08 -0000 1.1.1.1.4.2
+++ src/game/g_client.c 17 Feb 2009 04:33:41 -0000
@@ -81,6 +81,97 @@ void SP_info_human_intermission( gentity
/*
===============
+G_OverflowCredits
+===============
+*/
+void G_OverflowCredits( gclient_t *doner, int credits )
+{
+ int i;
+ int maxCredits;
+ int clientNum;
+
+ if( !g_creditOverflow.integer )
+ return;
+
+ if( doner->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
+ {
+ maxCredits = ALIEN_MAX_KILLS;
+ clientNum = level.lastCreditedAlien;
+ }
+ else if( doner->ps.stats[ STAT_PTEAM ] == PTE_HUMANS )
+ {
+ maxCredits = HUMAN_MAX_CREDITS;
+ clientNum = level.lastCreditedHuman;
+ }
+ else
+ {
+ return;
+ }
+
+ if( g_creditOverflow.integer == 1 )
+ {
+ // distribute to everyone on team
+ gentity_t *vic;
+
+ i = 0;
+ while( credits > 0 && i < level.maxclients )
+ {
+ i++;
+ clientNum++;
+ if( clientNum >= level.maxclients )
+ clientNum = 0;
+
+ vic = &g_entities[ clientNum ];
+ if( vic->client->ps.stats[ STAT_PTEAM ] != doner->ps.stats[ STAT_PTEAM ] ||
+ vic->client->ps.persistant[ PERS_CREDIT ] >= maxCredits )
+ continue;
+
+ if( vic->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS )
+ level.lastCreditedAlien = clientNum;
+ else
+ level.lastCreditedHuman = clientNum;
+
+ if( vic->client->ps.persistant[ PERS_CREDIT ] + credits > maxCredits )
+ {
+ credits -= maxCredits - vic->client->ps.persistant[ PERS_CREDIT ];
+ vic->client->ps.persistant[ PERS_CREDIT ] = maxCredits;
+ }
+ else
+ {
+ vic->client->ps.persistant[ PERS_CREDIT ] += credits;
+ return;
+ }
+ }
+ }
+ else if( g_creditOverflow.integer == 2 )
+ {
+ // distribute by team rank
+ gclient_t *cl;
+
+ for( i = 0; i < level.numPlayingClients && credits > 0; i++ )
+ {
+ // get the client list sorted by rank
+ cl = &level.clients[ level.sortedClients[ i ] ];
+ if( cl->ps.stats[ STAT_PTEAM ] != doner->ps.stats[ STAT_PTEAM ] ||
+ cl->ps.persistant[ PERS_CREDIT ] >= maxCredits )
+ continue;
+
+ if( cl->ps.persistant[ PERS_CREDIT ] + credits > maxCredits )
+ {
+ credits -= maxCredits - cl->ps.persistant[ PERS_CREDIT ];
+ cl->ps.persistant[ PERS_CREDIT ] = maxCredits;
+ }
+ else
+ {
+ cl->ps.persistant[ PERS_CREDIT ] += credits;
+ return;
+ }
+ }
+ }
+}
+
+/*
+===============
G_AddCreditToClient
===============
*/
@@ -96,13 +187,19 @@ void G_AddCreditToClient( gclient_t *cli
{
if( client->pers.credit >= ALIEN_MAX_KILLS &&
credit > 0 )
+ {
+ G_OverflowCredits( client, credit );
return;
+ }
}
else if( client->pers.teamSelection == PTE_HUMANS )
{
if( client->pers.credit >= HUMAN_MAX_CREDITS &&
credit > 0 )
+ {
+ G_OverflowCredits( client, credit );
return;
+ }
}
}
@@ -113,12 +210,18 @@ void G_AddCreditToClient( gclient_t *cli
if( client->pers.teamSelection == PTE_ALIENS )
{
if( client->pers.credit > ALIEN_MAX_KILLS )
+ {
+ G_OverflowCredits( client, client->ps.persistant[ PERS_CREDIT ] - ALIEN_MAX_KILLS );
client->pers.credit = ALIEN_MAX_KILLS;
+ }
}
else if( client->pers.teamSelection == PTE_HUMANS )
{
if( client->pers.credit > HUMAN_MAX_CREDITS )
+ {
+ G_OverflowCredits( client, client->ps.persistant[ PERS_CREDIT ] - HUMAN_MAX_CREDITS );
client->pers.credit = HUMAN_MAX_CREDITS;
+ }
}
}
Index: src/game/g_local.h
===================================================================
RCS file: /devel/cvs/tremulous/src/game/g_local.h,v
retrieving revision 1.1.1.1.4.3
diff -u -p -r1.1.1.1.4.3 g_local.h
--- src/game/g_local.h 17 Feb 2009 03:30:08 -0000 1.1.1.1.4.3
+++ src/game/g_local.h 17 Feb 2009 04:33:41 -0000
@@ -747,6 +747,9 @@ typedef struct
qboolean paused;
int pausedTime;
+ int lastCreditedAlien;
+ int lastCreditedHuman;
+
int unlaggedIndex;
int unlaggedTimes[ MAX_UNLAGGED_MARKERS ];
@@ -1285,6 +1288,7 @@ extern vmCvar_t pmove_fixed;
extern vmCvar_t pmove_msec;
extern vmCvar_t g_rankings;
extern vmCvar_t g_allowShare;
+extern vmCvar_t g_creditOverflow;
extern vmCvar_t g_enableDust;
extern vmCvar_t g_enableBreath;
extern vmCvar_t g_singlePlayer;
Index: src/game/g_main.c
===================================================================
RCS file: /devel/cvs/tremulous/src/game/g_main.c,v
retrieving revision 1.1.1.1.4.6
diff -u -p -r1.1.1.1.4.6 g_main.c
--- src/game/g_main.c 17 Feb 2009 04:32:15 -0000 1.1.1.1.4.6
+++ src/game/g_main.c 17 Feb 2009 04:33:41 -0000
@@ -175,6 +175,7 @@ vmCvar_t g_tag;
vmCvar_t g_dretchPunt;
vmCvar_t g_allowShare;
+vmCvar_t g_creditOverflow;
vmCvar_t g_devmapNoGod;
vmCvar_t g_devmapNoStructDmg;
@@ -355,6 +356,7 @@ static cvarTable_t gameCvarTable[ ] =
{ &g_rankings, "g_rankings", "0", 0, 0, qfalse },
{ &g_allowShare, "g_allowShare", "0", CVAR_ARCHIVE | CVAR_SERVERINFO, 0, qfalse},
+ { &g_creditOverflow, "g_creditOverflow", "0", CVAR_ARCHIVE | CVAR_SERVERINFO, 0, qfalse},
{ &g_banNotice, "g_banNotice", "", CVAR_ARCHIVE, 0, qfalse },
};