From: Rudolf Polzer Date: Mon, 17 Dec 2012 14:06:15 +0000 (+0100) Subject: fix a few syntax errors X-Git-Tag: xonotic-v0.7.0~99^2~16 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=09c2c7cc220916338ad8d401265624efc5114a4e fix a few syntax errors --- diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc index 9bd8e8c8a3..d65c517a30 100644 --- a/qcsrc/client/Defs.qc +++ b/qcsrc/client/Defs.qc @@ -1,6 +1,3 @@ -#pragma flag off fastarrays // make dp behave with new fteqcc versions. remove when dp bug with fteqcc fastarrays is fixed - - //NOTE: THIS IS AN INTERFACE FILE. DO NOT EDIT. //MODIFYING THIS FILE CAN RESULT IN CRC ERRORS. //YOU HAVE BEEN WARNED. diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh index b8c5502a84..3d6911b3fe 100644 --- a/qcsrc/common/util.qh +++ b/qcsrc/common/util.qh @@ -45,7 +45,7 @@ string wordwrap(string s, float l); void wordwrap_sprint(string s, float l); #endif #endif -void wordwrap_cb(string s, float l, void(string) callback) +void wordwrap_cb(string s, float l, void(string) callback); #ifndef SVQC string draw_currentSkin; @@ -226,8 +226,8 @@ void WriteInt24_t(float dest, float val); #endif // the NULL function -const var void func_null(void); FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(func_null) -const var string string_null; +var void func_null(void); FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(func_null) +var string string_null; float float2range11(float f); float float2range01(float f); @@ -308,7 +308,7 @@ float xdecode(string s); float lowestbit(float f); #ifdef CSQC -entity ReadCSQCEntity() +entity ReadCSQCEntity(); #endif #ifndef MENUQC diff --git a/qcsrc/dpdefs/csprogsdefs.qc b/qcsrc/dpdefs/csprogsdefs.qc index c9b9ce9cbc..79d33fd3c2 100644 --- a/qcsrc/dpdefs/csprogsdefs.qc +++ b/qcsrc/dpdefs/csprogsdefs.qc @@ -335,7 +335,7 @@ void(entity e, vector o) setorigin = #2; void(entity e, string m) setmodel = #3; void(entity e, vector min, vector max) setsize = #4; -void() break = #6; +void() break_builtin = #6; float() random = #7; void(entity e, float chan, string samp) sound = #8; vector(vector v) normalize = #9; diff --git a/qcsrc/dpdefs/menudefs.qc b/qcsrc/dpdefs/menudefs.qc index c119874617..8b2933a546 100644 --- a/qcsrc/dpdefs/menudefs.qc +++ b/qcsrc/dpdefs/menudefs.qc @@ -253,7 +253,7 @@ vector stov(string s) = #55; string strzone(string s) = #56; void strunzone(string s) = #57; -float tokenize(string s) = #58 +float tokenize(string s) = #58; string argv(float n) = #59; float isserver(void) = #60; diff --git a/qcsrc/dpdefs/progsdefs.qc b/qcsrc/dpdefs/progsdefs.qc index 912c3ecabe..00e0d31b21 100644 --- a/qcsrc/dpdefs/progsdefs.qc +++ b/qcsrc/dpdefs/progsdefs.qc @@ -402,7 +402,7 @@ void(entity e, vector o) setorigin = #2; void(entity e, string m) setmodel = #3; // set movetype and solid first void(entity e, vector min, vector max) setsize = #4; // #5 was removed -void() break = #6; +void() break_builtin = #6; float() random = #7; // returns 0 - 1 void(entity e, float chan, string samp, float vol, float atten) sound = #8; vector(vector v) normalize = #9; diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc index 73025f1f61..5b10ab50b6 100644 --- a/qcsrc/server/antilag.qc +++ b/qcsrc/server/antilag.qc @@ -1,18 +1,12 @@ #define ANTILAG_MAX_ORIGINS 64 -.vector antilag_origins[ANTILAG_MAX_ORIGINS]; -.float antilag_times[ANTILAG_MAX_ORIGINS]; +.vector antilag_origins[ANTILAG_MAX_ORIGINS]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(antilag_origins); +.float antilag_times[ANTILAG_MAX_ORIGINS]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(antilag_times); .float antilag_index; .vector antilag_saved_origin; .float antilag_takenback; .float antilag_debug; -void antilag_dummy() -{ - self.antilag_times = 0; - self.antilag_origins = '0 0 0'; -} - void antilag_record(entity e, float t) { if (e.vehicle && e.vehicle.vehicle_flags == VHF_PLAYERSLOT) diff --git a/qcsrc/server/command/banning.qh b/qcsrc/server/command/banning.qh index 8e3ecb7ba0..8c71af1793 100644 --- a/qcsrc/server/command/banning.qh +++ b/qcsrc/server/command/banning.qh @@ -12,4 +12,4 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync); float Ban_Delete(float i); // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file -void BanCommand_macro_write_aliases(float fh) +void BanCommand_macro_write_aliases(float fh); diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 8b6d65e121..4138c2945e 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -435,7 +435,7 @@ void GlobalSound(string samplestring, float channel, float voicetype); void FakeGlobalSound(string samplestring, float channel, float voicetype); void VoiceMessage(string type, string message); float GetPlayerSoundSampleField_notFound; -.string GetVoiceMessageSampleField(string type) +.string GetVoiceMessageSampleField(string type); // autotaunt system .float cvar_cl_autotaunt; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index a41389a4fd..dc615afb62 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -58,7 +58,7 @@ float world_initialized; string GetMapname(); string GetGametype(); void GotoNextMap(float reinit); -void ShuffleMaplist() +void ShuffleMaplist(); float(float reinit) DoNextMapOverride; void SetDefaultAlpha() @@ -2029,7 +2029,6 @@ float WinningCondition_Race(float fraglimit) return WINNING_STARTSUDDENDEATHOVERTIME; else return WINNING_NEVER; - return wc; } float WinningCondition_QualifyingThenRace(float limit) diff --git a/qcsrc/server/mutators/base.qh b/qcsrc/server/mutators/base.qh index 29a8e4e0b5..1b6cea8fc4 100644 --- a/qcsrc/server/mutators/base.qh +++ b/qcsrc/server/mutators/base.qh @@ -6,7 +6,7 @@ float CallbackChain_ReturnValue; // read-only field of the current return value entity CallbackChain_New(string name); -float CallbackChain_Add(entity cb, float() func, float order) +float CallbackChain_Add(entity cb, float() func, float order); float CallbackChain_Remove(entity cb, float() func); // a callback function is like this: // float mycallback(entity me) diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc index f453cc22ad..b9bcd5ba09 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qc +++ b/qcsrc/server/mutators/gamemode_ctf.qc @@ -2197,13 +2197,11 @@ MUTATOR_DEFINITION(gamemode_ctf) { if(time > 1) // game loads at time 1 error("This is a game type and it cannot be added at runtime."); - g_ctf = 1; ctf_Initialize(); } MUTATOR_ONREMOVE { - g_ctf = 0; error("This is a game type and it cannot be removed at runtime."); } diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh index b6ca033bb3..1c5898bd1a 100644 --- a/qcsrc/server/mutators/gamemode_ctf.qh +++ b/qcsrc/server/mutators/gamemode_ctf.qh @@ -1,7 +1,7 @@ // these are needed since mutators are compiled last // used in cheats.qc -void ctf_RespawnFlag(entity flag) +void ctf_RespawnFlag(entity flag); // score rule declarations #define ST_CTF_CAPS 1