migrated a large number of #define MAX values to quakedef.h and added a

[xonotic/darkplaces.git] / clvm_cmds.c

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 82d63a16dd317bfeee17e42c8d426b2115c19f7f..6e6efed86c491d6584a214f7a0871dc9a47b36a2 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -189,7 +189,7 @@ static void VM_CL_sound (void)
                return;
        }
 
                return;
        }
 

-       S_StartSound(32768 + PRVM_NUM_FOR_EDICT(entity), channel, S_FindName(sample), entity->fields.client->origin, volume, attenuation);
+       S_StartSound(MAX_EDICTS + PRVM_NUM_FOR_EDICT(entity), channel, S_FindName(sample), entity->fields.client->origin, volume, attenuation);

 }
 
 // #483 void(vector origin, string sample, float volume, float attenuation) pointsound
 }
 
 // #483 void(vector origin, string sample, float volume, float attenuation) pointsound


@@ -219,8 +219,8 @@ static void VM_CL_pointsound(void)
                return;
        }
 
                return;
        }
 

-       // Send World Entity as Entity to Play Sound (for CSQC, that is 32768)
-       S_StartSound(32768, 0, S_FindName(sample), org, volume, attenuation);
+       // Send World Entity as Entity to Play Sound (for CSQC, that is MAX_EDICTS)
+       S_StartSound(MAX_EDICTS, 0, S_FindName(sample), org, volume, attenuation);

 }
 
 // #14 entity() spawn
 }
 
 // #14 entity() spawn


@@ -3594,8 +3594,8 @@ static void VM_CL_checkpvs (void)
 #if 1
        unsigned char *pvs;
 #else
 #if 1
        unsigned char *pvs;
 #else

-       static int fatpvsbytes;
-       static unsigned char fatpvs[MAX_MAP_LEAFS/8];
+       int fatpvsbytes;
+       unsigned char fatpvs[MAX_MAP_LEAFS/8];

 #endif
 
        VM_SAFEPARMCOUNT(2, VM_SV_checkpvs);
 #endif
 
        VM_SAFEPARMCOUNT(2, VM_SV_checkpvs);