Skip to content

Commit 07fa0d8

Browse files
committed
Revert "SV_Physics(): fix entity cap check in the for loop" for now
This reverts commit 56e21e3, which was intended to fix #124 It resulted in new issues in Arcane Dimensions, as descbribed here: #128 -- thanks to Alexey Lysiuk for noticing.
1 parent fe7809c commit 07fa0d8

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

Linux/sgml/Quakespasm.sgml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ QuakeSpasm 0.94 has support for playing the 2021 re-release content: Copy the qu
149149
<item> Add support for -userdir cmdline arg to override the hardcoded user directory.
150150
<item> Reset r_skyfog between maps.
151151
<item> SV_PushMove: preserve pusher solid field instead of overwriting with SOLID_BSP.
152-
<item> SV_Physics: fix entity cap check in the for loop to fix a 14-year-old bug.
153152
<item> Don't spawn monsters when starting map with nomonsters 1.
154153
<item> Disable EXT_packed_pixels support on big endian systems.
155154
<item> Allow any supported music type to be considered as cdrip.

Quake/sv_phys.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,6 @@ void SV_Physics (void)
11701170
{
11711171
int i;
11721172
int entity_cap; // For sv_freezenonclients
1173-
int *pentitycap;
11741173
edict_t *ent;
11751174

11761175
// let the progs know that a new frame has started
@@ -1187,14 +1186,12 @@ void SV_Physics (void)
11871186
ent = sv.edicts;
11881187

11891188
if (sv_freezenonclients.value)
1190-
{
11911189
entity_cap = svs.maxclients + 1; // Only run physics on clients and the world
1192-
pentitycap = &entity_cap;
1193-
}
11941190
else
1195-
pentitycap = &sv.num_edicts;
1191+
entity_cap = sv.num_edicts;
11961192

1197-
for (i = 0; i < *pentitycap; ++i, ent = NEXT_EDICT(ent))
1193+
//for (i=0 ; i<sv.num_edicts ; i++, ent = NEXT_EDICT(ent))
1194+
for (i=0 ; i<entity_cap ; i++, ent = NEXT_EDICT(ent))
11981195
{
11991196
if (ent->free)
12001197
continue;

Quakespasm.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ <H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.97.0</A>
233233
<LI> Add support for -userdir cmdline arg to override the hardcoded user directory.</LI>
234234
<LI> Reset r_skyfog between maps.</LI>
235235
<LI> SV_PushMove: preserve pusher solid field instead of overwriting with SOLID_BSP.</LI>
236-
<LI> SV_Physics: fix entity cap check in the for loop to fix a 14-year-old bug.</LI>
237236
<LI> Don't spawn monsters when starting map with nomonsters 1.</LI>
238237
<LI> Disable EXT_packed_pixels support on big endian systems.</LI>
239238
<LI> Allow any supported music type to be considered as cdrip.</LI>

Quakespasm.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@
244244
- SV_PushMove: preserve pusher solid field instead of overwriting
245245
with SOLID_BSP.
246246

247-
- SV_Physics: fix entity cap check in the for loop to fix
248-
a 14-year-old bug.
249-
250247
- Don't spawn monsters when starting map with nomonsters 1.
251248

252249
- Disable EXT_packed_pixels support on big endian systems.

0 commit comments

Comments
 (0)