From 236d1604246f9437c895fa6449fae90f43cae9f2 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 3 Feb 2009 13:09:16 +0000 Subject: [PATCH] fix some typos git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5725 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/Main.qc | 3 +-- data/qcsrc/client/miscfunctions.qc | 4 ++-- data/qcsrc/client/prandom.qc | 2 ++ data/qcsrc/client/prandom.qh | 7 +++++++ data/qcsrc/server/g_world.qc | 1 + data/qcsrc/server/miscfunctions.qc | 4 ++-- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc index 62a7bc532..d4c162209 100644 --- a/data/qcsrc/client/Main.qc +++ b/data/qcsrc/client/Main.qc @@ -636,6 +636,7 @@ void(float bIsNewEntity) CSQC_Ent_Update = case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break; case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break; case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break; + case ENT_CLIENT_POINTPARTICLES: Ent_PointParticles(); break; case ENT_CLIENT_RAINSNOW: Ent_RainOrSnow(); break; case ENT_CLIENT_LASER: Ent_Laser(); break; case ENT_CLIENT_NAGGER: Ent_Nagger(); break; @@ -662,8 +663,6 @@ void(float bIsNewEntity) CSQC_Ent_Update = // with others, make sure it can no longer do so. void Ent_Remove() { - float i; - if(self.entremove) self.entremove(); diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc index d1b359825..78aaa3468 100644 --- a/data/qcsrc/client/miscfunctions.qc +++ b/data/qcsrc/client/miscfunctions.qc @@ -386,10 +386,10 @@ string ColorTranslateRGB(string s) return s2; } -float cvar_or(string cvar, float v) +float cvar_or(string cv, float v) { string s; - s = cvar_string(cvar); + s = cvar_string(cv); if(s == "") return v; else diff --git a/data/qcsrc/client/prandom.qc b/data/qcsrc/client/prandom.qc index cf6d9cf61..7746cebef 100644 --- a/data/qcsrc/client/prandom.qc +++ b/data/qcsrc/client/prandom.qc @@ -1,5 +1,6 @@ // prandom - PREDICTABLE random number generator (not seeded yet) +#ifdef USE_PRANDOM float prandom_seed; float prandom() { @@ -28,3 +29,4 @@ void psrandom(float seed) { prandom_seed = seed; } +#endif diff --git a/data/qcsrc/client/prandom.qh b/data/qcsrc/client/prandom.qh index 29945cac1..8d8665734 100644 --- a/data/qcsrc/client/prandom.qh +++ b/data/qcsrc/client/prandom.qh @@ -1,5 +1,12 @@ // prandom - PREDICTABLE random number generator + +#ifdef USE_PRANDOM float prandom(); vector prandomvec(); void psrandom(float seed); +#else +#define prandom random +#define prandomvec randomvec +#define psrandom(x) +#endif diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index d0b39fc49..fcafeb6cf 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -303,6 +303,7 @@ float RandomSeed_Send(entity to, float sf) { WriteByte(MSG_ENTITY, ENT_CLIENT_RANDOMSEED); WriteShort(MSG_ENTITY, self.cnt); + return TRUE; } void RandomSeed_Think() { diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index e70e6ebc3..895b107cd 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -1642,8 +1642,8 @@ void Net_LinkEntity(entity e, float docull, float dt, float(entity, float) sendf if(e.model == "" || self.modelindex == 0) { - mi = self.mins; - ma = self.maxs; + mi = e.mins; + ma = e.maxs; setmodel(e, "null"); setsize(e, mi, ma); } -- 2.39.2