From: TimePath Date: Thu, 5 Nov 2015 01:38:45 +0000 (+1100) Subject: s/(void)/() X-Git-Tag: xonotic-v0.8.2~1716 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4e9ae30b350c9f471dcb72929e976735c818919;p=xonotic%2Fxonotic-data.pk3dir.git s/(void)/() --- diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 97297e748..7eb672ba5 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -19,7 +19,7 @@ void CSQCModel_Hook_PreDraw(bool isplayer); .int lodmodelindex0; .int lodmodelindex1; .int lodmodelindex2; -void CSQCPlayer_LOD_Apply(void) +void CSQCPlayer_LOD_Apply() {SELFPARAM(); // LOD model loading if(self.lodmodelindex0 != self.modelindex) @@ -108,14 +108,14 @@ int forceplayermodels_goodmodelindex; .vector glowmod; .vector old_glowmod; -void CSQCPlayer_ModelAppearance_PreUpdate(void) +void CSQCPlayer_ModelAppearance_PreUpdate() {SELFPARAM(); self.model = self.forceplayermodels_savemodel; self.modelindex = self.forceplayermodels_savemodelindex; self.skin = self.forceplayermodels_saveskin; self.colormap = self.forceplayermodels_savecolormap; } -void CSQCPlayer_ModelAppearance_PostUpdate(void) +void CSQCPlayer_ModelAppearance_PostUpdate() {SELFPARAM(); self.forceplayermodels_savemodel = self.model; self.forceplayermodels_savemodelindex = self.modelindex; @@ -310,7 +310,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer) .int csqcmodel_framecount; #define IS_DEAD_FRAME(f) ((f) == 0 || (f) == 1) -void CSQCPlayer_FallbackFrame_PreUpdate(void) +void CSQCPlayer_FallbackFrame_PreUpdate() {SELFPARAM(); self.frame = self.csqcmodel_saveframe; self.frame2 = self.csqcmodel_saveframe2; @@ -369,7 +369,7 @@ int CSQCPlayer_FallbackFrame(int f) LOG_INFOF("Frame %d missing in model %s, and we have no fallback - FAIL!\n", f, self.model); return f; } -void CSQCPlayer_FallbackFrame_Apply(void) +void CSQCPlayer_FallbackFrame_Apply() {SELFPARAM(); self.frame = CSQCPlayer_FallbackFrame(self.frame); self.frame2 = CSQCPlayer_FallbackFrame(self.frame2); @@ -383,7 +383,7 @@ void CSQCPlayer_FallbackFrame_Apply(void) .entity tag_entity; .int tag_entity_lastmodelindex; .int tag_index; -void CSQCModel_AutoTagIndex_Apply(void) +void CSQCModel_AutoTagIndex_Apply() {SELFPARAM(); if(self.tag_entity && wasfreed(self.tag_entity)) self.tag_entity = world; @@ -478,14 +478,14 @@ const int MF_TRACER3 = BIT(7); // purple trail .int csqcmodel_effects; .int csqcmodel_modelflags; .int csqcmodel_traileffect; -void CSQCModel_Effects_PreUpdate(void) +void CSQCModel_Effects_PreUpdate() {SELFPARAM(); self.effects = self.csqcmodel_effects; self.modelflags = self.csqcmodel_modelflags; self.traileffect = self.csqcmodel_traileffect; } -void Reset_ArcBeam(void); -void CSQCModel_Effects_PostUpdate(void) +void Reset_ArcBeam(); +void CSQCModel_Effects_PostUpdate() {SELFPARAM(); if (self == csqcplayer) { if (self.csqcmodel_teleported) { @@ -501,7 +501,7 @@ void CSQCModel_Effects_PostUpdate(void) Projectile_ResetTrail(self, self.origin); } .int snd_looping; -void CSQCModel_Effects_Apply(void) +void CSQCModel_Effects_Apply() {SELFPARAM(); int eff = self.csqcmodel_effects & ~CSQCMODEL_EF_RESPAWNGHOST; int tref = self.csqcmodel_traileffect; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 070bcbff1..3ec2a2167 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -952,7 +952,7 @@ void DrawAmmoItem(vector myPos, vector mySize, .int ammoType, bool isCurrent, bo int nade_prevstatus; int nade_prevframe; float nade_statuschange_time; -void HUD_Ammo(void) +void HUD_Ammo() { if(hud != HUD_NORMAL) return; if(!autocvar__hud_configure) @@ -1388,7 +1388,7 @@ void HUD_Powerups() // -void HUD_HealthArmor(void) +void HUD_HealthArmor() { int armor, health, fuel; if(!autocvar__hud_configure) @@ -1695,7 +1695,7 @@ void HUD_Notify_Push(string icon, string attacker, string victim) notify_times[notify_index] = time; } -void HUD_Notify(void) +void HUD_Notify() { if (!autocvar__hud_configure) if (!autocvar_hud_panel_notify) @@ -1808,7 +1808,7 @@ void HUD_Notify(void) notify_count = count; } -void HUD_Timer(void) +void HUD_Timer() { if(!autocvar__hud_configure) { @@ -2028,7 +2028,7 @@ void HUD_Radar_Mouse() drawpic(mousepos-'8 4 0', strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), cursor_size, '1 1 1', 0.8, DRAWFLAG_NORMAL); } -void HUD_Radar(void) +void HUD_Radar() { if (!autocvar__hud_configure) { @@ -2376,7 +2376,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me) while (i= self.nickspamtime) @@ -1057,7 +1057,7 @@ void PM_check_punch() #endif } -void PM_check_spider(void) +void PM_check_spider() {SELFPARAM(); #ifdef SVQC if (time >= self.spider_slowness) @@ -1070,7 +1070,7 @@ void PM_check_spider(void) } // predict frozen movement, as frozen players CAN move in some cases -void PM_check_frozen(void) +void PM_check_frozen() {SELFPARAM(); if (!PHYS_FROZEN(self)) return; @@ -1124,7 +1124,7 @@ void PM_check_hitground() #endif } -void PM_check_blocked(void) +void PM_check_blocked() {SELFPARAM(); #ifdef SVQC if (!self.player_blocked) @@ -1134,7 +1134,7 @@ void PM_check_blocked(void) #endif } -void PM_check_vortex(void) +void PM_check_vortex() {SELFPARAM(); #ifdef SVQC // WEAPONTODO @@ -1858,9 +1858,9 @@ void PM_Main() } #ifdef SVQC -void SV_PlayerPhysics(void) +void SV_PlayerPhysics() #elif defined(CSQC) -void CSQC_ClientMovement_PlayerMove_Frame(void) +void CSQC_ClientMovement_PlayerMove_Frame() #endif {SELFPARAM(); PM_Main(); diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index 0fcbd4259..7584e3353 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -11,7 +11,7 @@ #endif #ifdef SVQC -void PlayerStats_Prematch(void) +void PlayerStats_Prematch() { //foobar } @@ -635,7 +635,7 @@ void PlayerStats_PlayerDetail_AddItem(string event, string data) LOG_TRACE("Added item ", sprintf("#%s", event), "=", data, " to PS_D_IN_DB\n"); } -void PlayerStats_PlayerDetail(void) +void PlayerStats_PlayerDetail() { // http://stats.xonotic.org/player/me if((autocvar_g_playerstats_playerdetail_uri != "") && (crypto_getmyidstatus(0) > 0)) @@ -668,7 +668,7 @@ void PlayerStats_PlayerDetail(void) } } -void PlayerStats_PlayerDetail_CheckUpdate(void) +void PlayerStats_PlayerDetail_CheckUpdate() { // determine whether we should retrieve playerdetail information again float gamecount = cvar("cl_matchcount"); diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh index e77cdbff5..ec309c4f4 100644 --- a/qcsrc/common/playerstats.qh +++ b/qcsrc/common/playerstats.qh @@ -112,8 +112,8 @@ const float PS_D_STATUS_RECEIVED = 1; float PlayerStats_PlayerDetail_Status = PS_D_STATUS_IDLE; string autocvar_g_playerstats_playerdetail_uri = "http://stats.xonotic.org/player/me"; float autocvar_g_playerstats_playerdetail_autoupdatetime = 1800; // automatically update every 30 minutes anyway -void PlayerStats_PlayerDetail(void); -void PlayerStats_PlayerDetail_CheckUpdate(void); +void PlayerStats_PlayerDetail(); +void PlayerStats_PlayerDetail_CheckUpdate(); void PlayerStats_PlayerDetail_Handler(entity fh, entity p, float status); #endif #endif diff --git a/qcsrc/common/triggers/subs.qc b/qcsrc/common/triggers/subs.qc index 850158a63..a0f60bb32 100644 --- a/qcsrc/common/triggers/subs.qc +++ b/qcsrc/common/triggers/subs.qc @@ -1,4 +1,4 @@ -void SUB_NullThink(void) { } +void SUB_NullThink() { } void() SUB_CalcMoveDone; void() SUB_CalcAngleMoveDone; @@ -12,7 +12,7 @@ Applies some friction to self ================== */ .float friction; -void SUB_Friction (void) +void SUB_Friction () {SELFPARAM(); self.SUB_NEXTTHINK = time; if(self.SUB_FLAGS & FL_ONGROUND) @@ -45,7 +45,7 @@ void SUB_VanishOrRemove (entity ent) } } -void SUB_SetFade_Think (void) +void SUB_SetFade_Think () {SELFPARAM(); if(self.alpha == 0) self.alpha = 1; @@ -80,7 +80,7 @@ calculate self.SUB_VELOCITY and self.SUB_NEXTTHINK to reach dest from self.SUB_ORIGIN traveling at speed =============== */ -void SUB_CalcMoveDone (void) +void SUB_CalcMoveDone () {SELFPARAM(); // After moving, set origin to exact final destination @@ -92,7 +92,7 @@ void SUB_CalcMoveDone (void) } .float platmovetype_turn; -void SUB_CalcMove_controller_think (void) +void SUB_CalcMove_controller_think () {SELFPARAM(); entity oldself; float traveltime; @@ -308,7 +308,7 @@ self.angles rotating The calling function should make sure self.SUB_THINK is valid =============== */ -void SUB_CalcAngleMoveDone (void) +void SUB_CalcAngleMoveDone () {SELFPARAM(); // After rotating, set angle to exact final angle self.angles = self.finalangle; diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc index 92575384f..1f0c00e5e 100644 --- a/qcsrc/common/triggers/teleporters.qc +++ b/qcsrc/common/triggers/teleporters.qc @@ -177,7 +177,7 @@ entity Simple_TeleportPlayer(entity teleporter, entity player) return e; } -void teleport_findtarget (void) +void teleport_findtarget () {SELFPARAM(); entity e; float n; diff --git a/qcsrc/common/triggers/teleporters.qh b/qcsrc/common/triggers/teleporters.qh index bdd24ddef..01e738e43 100644 --- a/qcsrc/common/triggers/teleporters.qh +++ b/qcsrc/common/triggers/teleporters.qh @@ -53,9 +53,9 @@ void TeleportPlayer(entity teleporter, entity player, vector to, vector to_angle entity Simple_TeleportPlayer(entity teleporter, entity player); -void Teleport_Touch (void); +void Teleport_Touch (); -void teleport_findtarget (void); +void teleport_findtarget (); entity Teleport_Find(vector mi, vector ma); diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc index c50dc1090..7d58ef007 100644 --- a/qcsrc/common/triggers/trigger/swamp.qc +++ b/qcsrc/common/triggers/trigger/swamp.qc @@ -22,7 +22,7 @@ #ifdef SVQC spawnfunc(trigger_swamp); #endif -void swamp_touch(void); +void swamp_touch(); void swampslug_think(); @@ -36,7 +36,7 @@ void swampslug_think(); * * I do it this way becuz there is no "untouch" event. */ -void swampslug_think(void) +void swampslug_think() {SELFPARAM(); //Slowly kill the slug self.health = self.health - 1; @@ -60,7 +60,7 @@ void swampslug_think(void) self.nextthink = time + self.swamp_interval; } -void swamp_touch(void) +void swamp_touch() {SELFPARAM(); // If whatever thats touching the swamp is not a player // or if its a dead player, just dont care abt it. diff --git a/qcsrc/common/triggers/trigger/teleport.qc b/qcsrc/common/triggers/trigger/teleport.qc index 95bd7fbbd..652266920 100644 --- a/qcsrc/common/triggers/trigger/teleport.qc +++ b/qcsrc/common/triggers/trigger/teleport.qc @@ -8,7 +8,7 @@ void trigger_teleport_use() #endif } -void Teleport_Touch (void) +void Teleport_Touch () {SELFPARAM(); string s; diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc index c2a609b15..34cf50eac 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -25,7 +25,7 @@ float T_Config_Queue_Compare(float root, float child, entity pass) return 0; } -void Dump_Turret_Settings(void) +void Dump_Turret_Settings() { float x, totalsettings = 0; FOREACH(Turrets, it != TUR_Null, LAMBDA({ diff --git a/qcsrc/common/turrets/config.qh b/qcsrc/common/turrets/config.qh index 4d35ee3b3..bb2a81b84 100644 --- a/qcsrc/common/turrets/config.qh +++ b/qcsrc/common/turrets/config.qh @@ -3,7 +3,7 @@ #ifdef SVQC -void Dump_Turret_Settings(void); +void Dump_Turret_Settings(); float tur_config_file; float tur_config_alsoprint; diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index 7d1b4e3d2..3ee4a684a 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -22,7 +22,7 @@ float W_Config_Queue_Compare(int root, int child, entity pass) return strcmp(wep_config_queue[root], wep_config_queue[child]); } -void Dump_Weapon_Settings(void) +void Dump_Weapon_Settings() { int i, x, totalsettings = 0; for(i = WEP_FIRST; i <= WEP_LAST; ++i) diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh index c50c1e544..b232bbcda 100644 --- a/qcsrc/common/weapons/config.qh +++ b/qcsrc/common/weapons/config.qh @@ -6,7 +6,7 @@ // Balance Config Generator // ========================== -void Dump_Weapon_Settings(void); +void Dump_Weapon_Settings(); int wep_config_file; bool wep_config_alsoprint; diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index 101029fe3..1bb921982 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -214,7 +214,7 @@ void Arc_Player_SetHeat(entity player) //dprint("Heat: ",ftos(player.arc_heat_percent*100),"%\n"); } -void W_Arc_Beam_Think(void) +void W_Arc_Beam_Think() {SELFPARAM(); if(self != self.owner.arc_beam) { @@ -839,7 +839,7 @@ void Draw_ArcBeam_callback(vector start, vector hit, vector end) Draw_ArcBeam_callback_last_bottom = WarpZone_UnTransformOrigin(WarpZone_trace_transform, bottom); } -void Reset_ArcBeam(void) +void Reset_ArcBeam() { entity e; for (e = world; (e = findfloat(e, beam_usevieworigin, 1)); ) { @@ -1143,7 +1143,7 @@ void Draw_ArcBeam(entity this) Draw_ArcBeam_callback_last_bottom = '0 0 0'; } -void Remove_ArcBeam(void) +void Remove_ArcBeam() {SELFPARAM(); remove(self.beam_muzzleentity); sound(self, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, ATTEN_NORM); diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc index a26617ecc..055293e93 100644 --- a/qcsrc/common/weapons/weapon/blaster.qc +++ b/qcsrc/common/weapons/weapon/blaster.qc @@ -53,7 +53,7 @@ BLASTER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) spawnfunc(weapon_blaster) { weapon_defaultspawnfunc(this, WEP_BLASTER); } spawnfunc(weapon_laser) { spawnfunc_weapon_blaster(this); } -void W_Blaster_Touch(void) +void W_Blaster_Touch() {SELFPARAM(); PROJECTILE_TOUCH; @@ -75,7 +75,7 @@ void W_Blaster_Touch(void) remove(self); } -void W_Blaster_Think(void) +void W_Blaster_Think() {SELFPARAM(); self.movetype = MOVETYPE_FLY; self.think = SUB_Remove; diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc index d2a477bf8..252cc56dc 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -108,7 +108,7 @@ void W_Crylink_Dequeue(entity e) W_Crylink_Dequeue_Raw(e.realowner, e.queueprev, e, e.queuenext); } -void W_Crylink_Reset(void) +void W_Crylink_Reset() {SELFPARAM(); W_Crylink_Dequeue(self); remove(self); @@ -225,7 +225,7 @@ vector W_Crylink_LinkJoin(entity e, float jspeed) return targ_origin; } -void W_Crylink_LinkJoinEffect_Think(void) +void W_Crylink_LinkJoinEffect_Think() {SELFPARAM(); // is there at least 2 projectiles very close? entity e, p; @@ -290,7 +290,7 @@ float W_Crylink_Touch_WouldHitFriendly(entity projectile, float rad) } // NO bounce protection, as bounces are limited! -void W_Crylink_Touch(void) +void W_Crylink_Touch() {SELFPARAM(); float finalhit; float f; @@ -335,7 +335,7 @@ void W_Crylink_Touch(void) // CSQCProjectile(proj, true, PROJECTILE_CRYLINK, true); } -void W_Crylink_Fadethink(void) +void W_Crylink_Fadethink() {SELFPARAM(); W_Crylink_Dequeue(self); remove(self); diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index 1454a5012..d6ffd50d6 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -69,7 +69,7 @@ spawnfunc(weapon_rocketlauncher) { spawnfunc_weapon_devastator(this); } .entity lastrocket; -void W_Devastator_Unregister(void) +void W_Devastator_Unregister() {SELFPARAM(); if(self.realowner && self.realowner.lastrocket == self) { @@ -78,7 +78,7 @@ void W_Devastator_Unregister(void) } } -void W_Devastator_Explode(void) +void W_Devastator_Explode() {SELFPARAM(); W_Devastator_Unregister(); @@ -247,7 +247,7 @@ vector W_Devastator_SteerTo(vector thisdir, vector goaldir, float maxturn_cos) // normalize(thisdir + goaldir) // normalize(0) -void W_Devastator_Think(void) +void W_Devastator_Think() {SELFPARAM(); vector desireddir, olddir, newdir, desiredorigin, goal; float velspeed, f; @@ -315,7 +315,7 @@ void W_Devastator_Think(void) UpdateCSQCProjectile(self); } -void W_Devastator_Touch(void) +void W_Devastator_Touch() {SELFPARAM(); if(WarpZone_Projectile_Touch()) { diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 304fb12e6..0f48bb259 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -64,7 +64,7 @@ REGISTER_WEAPON(ELECTRO, NEW(Electro)); ELECTRO_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) .float electro_count; .float electro_secondarytime; -void W_Electro_ExplodeCombo(void); +void W_Electro_ExplodeCombo(); #endif #endif #ifdef IMPLEMENTATION @@ -118,7 +118,7 @@ void W_Electro_TriggerCombo(vector org, float rad, entity own) } } -void W_Electro_ExplodeCombo(void) +void W_Electro_ExplodeCombo() {SELFPARAM(); W_Electro_TriggerCombo(self.origin, WEP_CVAR(electro, combo_comboradius), self.realowner); @@ -140,7 +140,7 @@ void W_Electro_ExplodeCombo(void) remove(self); } -void W_Electro_Explode(void) +void W_Electro_Explode() {SELFPARAM(); if(other.takedamage == DAMAGE_AIM) if(IS_PLAYER(other)) @@ -187,13 +187,13 @@ void W_Electro_Explode(void) remove(self); } -void W_Electro_TouchExplode(void) +void W_Electro_TouchExplode() { PROJECTILE_TOUCH; W_Electro_Explode(); } -void W_Electro_Bolt_Think(void) +void W_Electro_Bolt_Think() {SELFPARAM(); if(time >= self.ltime) { @@ -289,7 +289,7 @@ void W_Electro_Attack_Bolt(Weapon thiswep) MUTATOR_CALLHOOK(EditProjectile, self, proj); } -void W_Electro_Orb_Touch(void) +void W_Electro_Orb_Touch() {SELFPARAM(); PROJECTILE_TOUCH; if(other.takedamage == DAMAGE_AIM) diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc index b6a3d8270..7b96971e9 100644 --- a/qcsrc/common/weapons/weapon/fireball.qc +++ b/qcsrc/common/weapons/weapon/fireball.qc @@ -59,7 +59,7 @@ FIREBALL_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) #ifdef SVQC spawnfunc(weapon_fireball) { weapon_defaultspawnfunc(this, WEP_FIREBALL); } -void W_Fireball_Explode(void) +void W_Fireball_Explode() {SELFPARAM(); entity e; float dist; @@ -109,7 +109,7 @@ void W_Fireball_Explode(void) remove(self); } -void W_Fireball_TouchExplode(void) +void W_Fireball_TouchExplode() { PROJECTILE_TOUCH; W_Fireball_Explode(); @@ -149,7 +149,7 @@ void W_Fireball_LaserPlay(float dt, float dist, float damage, float edgedamage, } } -void W_Fireball_Think(void) +void W_Fireball_Think() {SELFPARAM(); if(time > self.pushltime) { @@ -180,7 +180,7 @@ void W_Fireball_Damage(entity inflictor, entity attacker, float damage, int deat } } -void W_Fireball_Attack1(void) +void W_Fireball_Attack1() {SELFPARAM(); entity proj; @@ -256,7 +256,7 @@ void W_Fireball_Attack1_Frame0(Weapon thiswep, entity actor, .entity weaponentit weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(fireball, animtime), W_Fireball_Attack1_Frame1); } -void W_Fireball_Firemine_Think(void) +void W_Fireball_Firemine_Think() {SELFPARAM(); if(time > self.pushltime) { @@ -282,7 +282,7 @@ void W_Fireball_Firemine_Think(void) self.nextthink = time + 0.1; } -void W_Fireball_Firemine_Touch(void) +void W_Fireball_Firemine_Touch() {SELFPARAM(); PROJECTILE_TOUCH; if(other.takedamage == DAMAGE_AIM) @@ -294,7 +294,7 @@ void W_Fireball_Firemine_Touch(void) self.projectiledeathtype |= HITTYPE_BOUNCE; } -void W_Fireball_Attack2(void) +void W_Fireball_Attack2() {SELFPARAM(); entity proj; vector f_diff; diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc index 4c0664e32..859b54c95 100644 --- a/qcsrc/common/weapons/weapon/hagar.qc +++ b/qcsrc/common/weapons/weapon/hagar.qc @@ -62,7 +62,7 @@ spawnfunc(weapon_hagar) { weapon_defaultspawnfunc(this, WEP_HAGAR); } // NO bounce protection, as bounces are limited! -void W_Hagar_Explode(void) +void W_Hagar_Explode() {SELFPARAM(); self.event_damage = func_null; RadiusDamage(self, self.realowner, WEP_CVAR_PRI(hagar, damage), WEP_CVAR_PRI(hagar, edgedamage), WEP_CVAR_PRI(hagar, radius), world, world, WEP_CVAR_PRI(hagar, force), self.projectiledeathtype, other); @@ -70,7 +70,7 @@ void W_Hagar_Explode(void) remove(self); } -void W_Hagar_Explode2(void) +void W_Hagar_Explode2() {SELFPARAM(); self.event_damage = func_null; RadiusDamage(self, self.realowner, WEP_CVAR_SEC(hagar, damage), WEP_CVAR_SEC(hagar, edgedamage), WEP_CVAR_SEC(hagar, radius), world, world, WEP_CVAR_SEC(hagar, force), self.projectiledeathtype, other); @@ -102,13 +102,13 @@ void W_Hagar_Damage(entity inflictor, entity attacker, float damage, int deathty W_PrepareExplosionByDamage(attacker, self.think); } -void W_Hagar_Touch(void) +void W_Hagar_Touch() {SELFPARAM(); PROJECTILE_TOUCH; self.use(); } -void W_Hagar_Touch2(void) +void W_Hagar_Touch2() {SELFPARAM(); PROJECTILE_TOUCH; diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 6b6583f42..9c4d8b2a6 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -52,7 +52,7 @@ HLAC_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) #ifdef SVQC spawnfunc(weapon_hlac) { weapon_defaultspawnfunc(this, WEP_HLAC); } -void W_HLAC_Touch(void) +void W_HLAC_Touch() {SELFPARAM(); float isprimary; @@ -115,7 +115,7 @@ void W_HLAC_Attack(Weapon thiswep) MUTATOR_CALLHOOK(EditProjectile, self, missile); } -void W_HLAC_Attack2(void) +void W_HLAC_Attack2() {SELFPARAM(); entity missile; float spread; diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index f447a1542..4e3722f13 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -76,7 +76,7 @@ HOOK_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) spawnfunc(weapon_hook) { weapon_defaultspawnfunc(this, WEP_HOOK); } -void W_Hook_ExplodeThink(void) +void W_Hook_ExplodeThink() {SELFPARAM(); float dt, dmg_remaining_next, f; @@ -96,7 +96,7 @@ void W_Hook_ExplodeThink(void) remove(self); } -void W_Hook_Explode2(void) +void W_Hook_Explode2() {SELFPARAM(); self.event_damage = func_null; self.touch = func_null; @@ -129,7 +129,7 @@ void W_Hook_Damage(entity inflictor, entity attacker, float damage, int deathtyp W_PrepareExplosionByDamage(self.realowner, W_Hook_Explode2); } -void W_Hook_Touch2(void) +void W_Hook_Touch2() {SELFPARAM(); PROJECTILE_TOUCH; self.use(); diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index b8f485493..4679ef38f 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -69,7 +69,7 @@ spawnfunc(weapon_machinegun) } spawnfunc(weapon_uzi) { spawnfunc_weapon_machinegun(this); } -void W_MachineGun_MuzzleFlash_Think(void) +void W_MachineGun_MuzzleFlash_Think() {SELFPARAM(); self.frame = self.frame + 2; self.scale = self.scale * 0.5; @@ -86,7 +86,7 @@ void W_MachineGun_MuzzleFlash_Think(void) } -void W_MachineGun_MuzzleFlash(void) +void W_MachineGun_MuzzleFlash() {SELFPARAM(); if(self.muzzle_flash == world) self.muzzle_flash = spawn(); diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index 5e6a230c1..1365e61b9 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -51,7 +51,7 @@ REGISTER_WEAPON(MINE_LAYER, NEW(MineLayer)); #ifdef SVQC MINELAYER_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) -void W_MineLayer_Think(void); +void W_MineLayer_Think(); .float minelayer_detonate, mine_explodeanyway; .float mine_time; .vector mine_orientation; @@ -107,7 +107,7 @@ void W_MineLayer_Stick(entity to) SetMovetypeFollow(self, to); } -void W_MineLayer_Explode(void) +void W_MineLayer_Explode() {SELFPARAM(); if(other.takedamage == DAMAGE_AIM) if(IS_PLAYER(other)) @@ -138,7 +138,7 @@ void W_MineLayer_Explode(void) remove(self); } -void W_MineLayer_DoRemoteExplode(void) +void W_MineLayer_DoRemoteExplode() {SELFPARAM(); self.event_damage = func_null; self.takedamage = DAMAGE_NO; @@ -165,7 +165,7 @@ void W_MineLayer_DoRemoteExplode(void) remove(self); } -void W_MineLayer_RemoteExplode(void) +void W_MineLayer_RemoteExplode() {SELFPARAM(); if(self.realowner.deadflag == DEAD_NO) if((self.spawnshieldtime >= 0) @@ -177,7 +177,7 @@ void W_MineLayer_RemoteExplode(void) } } -void W_MineLayer_ProximityExplode(void) +void W_MineLayer_ProximityExplode() {SELFPARAM(); // make sure no friend is in the mine's radius. If there is any, explosion is delayed until he's at a safe distance if(WEP_CVAR(minelayer, protection) && self.mine_explodeanyway == 0) @@ -206,7 +206,7 @@ int W_MineLayer_Count(entity e) return minecount; } -void W_MineLayer_Think(void) +void W_MineLayer_Think() {SELFPARAM(); entity head; @@ -269,7 +269,7 @@ void W_MineLayer_Think(void) W_MineLayer_RemoteExplode(); } -void W_MineLayer_Touch(void) +void W_MineLayer_Touch() {SELFPARAM(); if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW) return; // we're already a stuck mine, why do we get called? TODO does this even happen? diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc index 08bc2aa90..36a3c0c9e 100644 --- a/qcsrc/common/weapons/weapon/mortar.qc +++ b/qcsrc/common/weapons/weapon/mortar.qc @@ -61,7 +61,7 @@ MORTAR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) spawnfunc(weapon_mortar) { weapon_defaultspawnfunc(this, WEP_MORTAR); } spawnfunc(weapon_grenadelauncher) { spawnfunc_weapon_mortar(this); } -void W_Mortar_Grenade_Explode(void) +void W_Mortar_Grenade_Explode() {SELFPARAM(); if(other.takedamage == DAMAGE_AIM) if(IS_PLAYER(other)) @@ -81,7 +81,7 @@ void W_Mortar_Grenade_Explode(void) remove(self); } -void W_Mortar_Grenade_Explode2(void) +void W_Mortar_Grenade_Explode2() {SELFPARAM(); if(other.takedamage == DAMAGE_AIM) if(IS_PLAYER(other)) @@ -116,7 +116,7 @@ void W_Mortar_Grenade_Damage(entity inflictor, entity attacker, float damage, in W_PrepareExplosionByDamage(attacker, self.use); } -void W_Mortar_Grenade_Think1(void) +void W_Mortar_Grenade_Think1() {SELFPARAM(); self.nextthink = time; if(time > self.cnt) @@ -130,7 +130,7 @@ void W_Mortar_Grenade_Think1(void) W_Mortar_Grenade_Explode(); } -void W_Mortar_Grenade_Touch1(void) +void W_Mortar_Grenade_Touch1() {SELFPARAM(); PROJECTILE_TOUCH; if(other.takedamage == DAMAGE_AIM || WEP_CVAR_PRI(mortar, type) == 0) // always explode when hitting a player, or if normal mortar projectile @@ -162,7 +162,7 @@ void W_Mortar_Grenade_Touch1(void) } } -void W_Mortar_Grenade_Touch2(void) +void W_Mortar_Grenade_Touch2() {SELFPARAM(); PROJECTILE_TOUCH; if(other.takedamage == DAMAGE_AIM || WEP_CVAR_SEC(mortar, type) == 0) // always explode when hitting a player, or if normal mortar projectile diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 916e5c844..b8c54c416 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -53,7 +53,7 @@ MUTATOR_HOOKFUNCTION(porto_ticker, SV_StartFrame) { e.porto_forbidden = max(0, e.porto_forbidden - 1); } -void W_Porto_Success(void) +void W_Porto_Success() {SELFPARAM(); if(self.realowner == world) { @@ -109,7 +109,7 @@ void W_Porto_Remove(entity p) } } -void W_Porto_Think(void) +void W_Porto_Think() {SELFPARAM(); trace_plane_normal = '0 0 0'; if(self.realowner.playerid != self.playerid) @@ -118,7 +118,7 @@ void W_Porto_Think(void) W_Porto_Fail(0); } -void W_Porto_Touch(void) +void W_Porto_Touch() {SELFPARAM(); vector norm; diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index b28adaf9b..e7cd2606c 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -76,17 +76,17 @@ void W_Rifle_FireBullet(Weapon thiswep, float pSpread, float pDamage, float pFor SpawnCasing(((random() * 50 + 50) * v_right) - (v_forward * (random() * 25 + 25)) - ((random() * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3, self); } -void W_Rifle_Attack(void) +void W_Rifle_Attack() { W_Rifle_FireBullet(WEP_RIFLE, WEP_CVAR_PRI(rifle, spread), WEP_CVAR_PRI(rifle, damage), WEP_CVAR_PRI(rifle, force), WEP_CVAR_PRI(rifle, solidpenetration), WEP_CVAR_PRI(rifle, ammo), WEP_RIFLE.m_id, WEP_CVAR_PRI(rifle, tracer), WEP_CVAR_PRI(rifle, shots), SND(CAMPINGRIFLE_FIRE)); } -void W_Rifle_Attack2(void) +void W_Rifle_Attack2() { W_Rifle_FireBullet(WEP_RIFLE, WEP_CVAR_SEC(rifle, spread), WEP_CVAR_SEC(rifle, damage), WEP_CVAR_SEC(rifle, force), WEP_CVAR_SEC(rifle, solidpenetration), WEP_CVAR_SEC(rifle, ammo), WEP_RIFLE.m_id | HITTYPE_SECONDARY, WEP_CVAR_SEC(rifle, tracer), WEP_CVAR_SEC(rifle, shots), SND(CAMPINGRIFLE_FIRE2)); } -.void(void) rifle_bullethail_attackfunc; +.void() rifle_bullethail_attackfunc; .float rifle_bullethail_frame; .float rifle_bullethail_animtime; .float rifle_bullethail_refire; @@ -113,7 +113,7 @@ void W_Rifle_BulletHail_Continue(Weapon thiswep, entity actor, .entity weaponent } } -void W_Rifle_BulletHail(.entity weaponentity, float mode, void(void) AttackFunc, float fr, float animtime, float refire) +void W_Rifle_BulletHail(.entity weaponentity, float mode, void() AttackFunc, float fr, float animtime, float refire) {SELFPARAM(); // if we get here, we have at least one bullet to fire AttackFunc(); diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index 8091cfbdd..faf20a4fb 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -91,7 +91,7 @@ spawnfunc(weapon_seeker) { weapon_defaultspawnfunc(this, WEP_SEEKER); } // ============================ // Begin: Missile functions, these are general functions to be manipulated by other code // ============================ -void W_Seeker_Missile_Explode(void) +void W_Seeker_Missile_Explode() {SELFPARAM(); self.event_damage = func_null; RadiusDamage(self, self.realowner, WEP_CVAR(seeker, missile_damage), WEP_CVAR(seeker, missile_edgedamage), WEP_CVAR(seeker, missile_radius), world, world, WEP_CVAR(seeker, missile_force), self.projectiledeathtype, other); @@ -99,14 +99,14 @@ void W_Seeker_Missile_Explode(void) remove(self); } -void W_Seeker_Missile_Touch(void) +void W_Seeker_Missile_Touch() { PROJECTILE_TOUCH; W_Seeker_Missile_Explode(); } -void W_Seeker_Missile_Think(void) +void W_Seeker_Missile_Think() {SELFPARAM(); entity e; vector desireddir, olddir, newdir, eorg; @@ -221,7 +221,7 @@ void W_Seeker_Missile_Damage(entity inflictor, entity attacker, float damage, in } /* -void W_Seeker_Missile_Animate(void) +void W_Seeker_Missile_Animate() { self.frame = self.frame +1; self.nextthink = time + 0.05; @@ -301,7 +301,7 @@ void W_Seeker_Fire_Missile(Weapon thiswep, vector f_diff, entity m_target) // ============================ // Begin: FLAC, close range attack meant for defeating rockets which are coming at you. // ============================ -void W_Seeker_Flac_Explode(void) +void W_Seeker_Flac_Explode() {SELFPARAM(); self.event_damage = func_null; @@ -310,7 +310,7 @@ void W_Seeker_Flac_Explode(void) remove(self); } -void W_Seeker_Flac_Touch(void) +void W_Seeker_Flac_Touch() { PROJECTILE_TOUCH; @@ -388,7 +388,7 @@ entity W_Seeker_Tagged_Info(entity isowner, entity istarget) return world; } -void W_Seeker_Attack(void) +void W_Seeker_Attack() {SELFPARAM(); entity tracker, closest_target; @@ -411,7 +411,7 @@ void W_Seeker_Attack(void) W_Seeker_Fire_Missile(WEP_SEEKER, '0 0 0', closest_target); } -void W_Seeker_Vollycontroller_Think(void) // TODO: Merge this with W_Seeker_Attack +void W_Seeker_Vollycontroller_Think() // TODO: Merge this with W_Seeker_Attack {SELFPARAM(); float c; entity oldenemy; @@ -452,7 +452,7 @@ void W_Seeker_Vollycontroller_Think(void) // TODO: Merge this with W_Seeker_Atta setself(this); } -void W_Seeker_Tracker_Think(void) +void W_Seeker_Tracker_Think() {SELFPARAM(); // commit suicide if: You die OR target dies OR you switch away from the seeker OR commit suicide if lifetime is up if((self.realowner.deadflag != DEAD_NO) || (self.tag_target.deadflag != DEAD_NO) || (self.realowner.switchweapon != WEP_SEEKER.m_id) @@ -473,7 +473,7 @@ void W_Seeker_Tracker_Think(void) // ============================ // Begin: Tag projectile // ============================ -void W_Seeker_Tag_Explode(void) +void W_Seeker_Tag_Explode() {SELFPARAM(); //if(other==self.realowner) // return; @@ -491,7 +491,7 @@ void W_Seeker_Tag_Damage(entity inflictor, entity attacker, float damage, int de W_Seeker_Tag_Explode(); } -void W_Seeker_Tag_Touch(void) +void W_Seeker_Tag_Touch() {SELFPARAM(); vector dir; vector org2; diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index 171bf091f..e2f56c949 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -73,7 +73,7 @@ REGISTER_WEAPON(SHOCKWAVE, NEW(Shockwave)); SHOCKWAVE_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP) #endif #ifdef CSQC -void Net_ReadShockwaveParticle(void); +void Net_ReadShockwaveParticle(); .vector sw_shotorg; .vector sw_shotdir; .float sw_distance; @@ -107,7 +107,7 @@ float shockwave_hit_damage[MAX_SHOCKWAVE_HITS]; vector shockwave_hit_force[MAX_SHOCKWAVE_HITS]; // MELEE ATTACK MODE -void W_Shockwave_Melee_Think(void) +void W_Shockwave_Melee_Think() {SELFPARAM(); // declarations float i, f, swing, swing_factor, swing_damage, meleetime, is_player; @@ -335,7 +335,7 @@ float W_Shockwave_Attack_CheckHit( return true; } -void W_Shockwave_Send(void) +void W_Shockwave_Send() {SELFPARAM(); WriteHeader(MSG_BROADCAST, TE_CSQC_SHOCKWAVEPARTICLE); WriteCoord(MSG_BROADCAST, w_shotorg.x); @@ -350,7 +350,7 @@ void W_Shockwave_Send(void) WriteByte(MSG_BROADCAST, num_for_edict(self)); } -void W_Shockwave_Attack(void) +void W_Shockwave_Attack() {SELFPARAM(); // declarations float multiplier, multiplier_from_accuracy, multiplier_from_distance; @@ -838,7 +838,7 @@ NET_HANDLE(TE_CSQC_SHOCKWAVEPARTICLE, bool isNew) return true; } -void Net_ReadShockwaveParticle(void) +void Net_ReadShockwaveParticle() { entity shockwave; shockwave = spawn(); diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index 4a9a2069d..e7ad8b042 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -85,7 +85,7 @@ void W_Shotgun_Attack(Weapon thiswep, float isprimary) .float swing_prev; .entity swing_alreadyhit; -void W_Shotgun_Melee_Think(void) +void W_Shotgun_Melee_Think() {SELFPARAM(); // declarations float i, f, swing, swing_factor, swing_damage, meleetime, is_player; diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 851f9fcdf..308d43fc1 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -149,7 +149,7 @@ bool W_Tuba_HasPlayed(entity pl, string melody, int instrument, bool ignorepitch return true; } -void W_Tuba_NoteOff(void) +void W_Tuba_NoteOff() {SELFPARAM(); // we have a note: // on: self.spawnshieldtime @@ -281,7 +281,7 @@ bool W_Tuba_NoteSendEntity(entity this, entity to, int sf) return true; } -void W_Tuba_NoteThink(void) +void W_Tuba_NoteThink() {SELFPARAM(); float dist_mult; float vol0, vol1; diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index e24289e85..5a6082134 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -108,7 +108,7 @@ void W_Vaporizer_Attack(Weapon thiswep) W_DecreaseAmmo(thiswep, self, ((g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo))); } -void W_RocketMinsta_Laser_Explode (void) +void W_RocketMinsta_Laser_Explode () {SELFPARAM(); if(other.takedamage == DAMAGE_AIM) if(IS_PLAYER(other)) @@ -123,7 +123,7 @@ void W_RocketMinsta_Laser_Explode (void) remove(self); } -void W_RocketMinsta_Laser_Touch (void) +void W_RocketMinsta_Laser_Touch () {SELFPARAM(); PROJECTILE_TOUCH; //W_RocketMinsta_Laser_Explode (); @@ -131,7 +131,7 @@ void W_RocketMinsta_Laser_Touch (void) remove(self); } -void W_RocketMinsta_Attack2(void) +void W_RocketMinsta_Attack2() {SELFPARAM(); makevectors(self.v_angle); @@ -185,7 +185,7 @@ void W_RocketMinsta_Attack2(void) } } -void W_RocketMinsta_Attack3 (void) +void W_RocketMinsta_Attack3 () {SELFPARAM(); makevectors(self.v_angle); diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index c39ee8797..155ad7f92 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -146,7 +146,7 @@ void PM_Movement_Move() #endif } -void CSQCPlayer_Physics(void) +void CSQCPlayer_Physics() { switch(autocvar_cl_movement) { diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh index caddd06dd..bcb8af632 100644 --- a/qcsrc/lib/net.qh +++ b/qcsrc/lib/net.qh @@ -37,7 +37,7 @@ .void() uncustomizeentityforclient; .float uncustomizeentityforclient_set; - void SetCustomizer(entity e, float(void)customizer, void(void)uncustomizer) + void SetCustomizer(entity e, float()customizer, void()uncustomizer) { e.customizeentityforclient = customizer; e.uncustomizeentityforclient = uncustomizer; diff --git a/qcsrc/lib/nil.qh b/qcsrc/lib/nil.qh index 6b9cdd099..8067cf1ad 100644 --- a/qcsrc/lib/nil.qh +++ b/qcsrc/lib/nil.qh @@ -6,7 +6,7 @@ #define string_null nil #else // the NULL function - var void func_null(void); + var void func_null(); string string_null; #endif diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index 268a8aadd..27640770a 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -154,7 +154,7 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1) return 1; } -void WarpZone_Touch (void) +void WarpZone_Touch () {SELFPARAM(); if(other.classname == "trigger_warpzone") return; @@ -485,7 +485,7 @@ void WarpZonePosition_InitStep_FindTarget() self.enemy.aiment = self; } -void WarpZoneCamera_Think(void) +void WarpZoneCamera_Think() {SELFPARAM(); if(self.warpzone_save_origin != self.origin || self.warpzone_save_angles != self.angles @@ -884,7 +884,7 @@ spawnfunc(target_warpzone_reconnect) spawnfunc_trigger_warpzone_reconnect(this); // both names make sense here :( } -void WarpZone_PlayerPhysics_FixVAngle(void) +void WarpZone_PlayerPhysics_FixVAngle() {SELFPARAM(); #ifndef WARPZONE_DONT_FIX_VANGLE if(IS_REAL_CLIENT(self)) diff --git a/qcsrc/lib/warpzone/server.qh b/qcsrc/lib/warpzone/server.qh index 943f0322a..b96b7b336 100644 --- a/qcsrc/lib/warpzone/server.qh +++ b/qcsrc/lib/warpzone/server.qh @@ -12,7 +12,7 @@ float WarpZone_Projectile_Touch_ImpactFilter_Callback(); //const float ENT_CLIENT_WARPZONE; //const float ENT_CLIENT_WARPZONE_CAMERA; -void WarpZone_PlayerPhysics_FixVAngle(void); +void WarpZone_PlayerPhysics_FixVAngle(); -void WarpZone_PostInitialize_Callback(void); +void WarpZone_PostInitialize_Callback(); #endif diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc index 5522e13c7..f04a0d23a 100644 --- a/qcsrc/menu/xonotic/gametypelist.qc +++ b/qcsrc/menu/xonotic/gametypelist.qc @@ -25,7 +25,7 @@ entity makeXonoticGametypeList(); #ifdef IMPLEMENTATION -entity makeXonoticGametypeList(void) +entity makeXonoticGametypeList() { entity me; me = NEW(XonoticGametypeList); diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc index c607de4f4..b12556471 100644 --- a/qcsrc/server/bot/bot.qc +++ b/qcsrc/server/bot/bot.qc @@ -556,7 +556,7 @@ void autoskill(float factor) head.totalfrags_lastcheck = head.totalfrags; } -void bot_calculate_stepheightvec(void) +void bot_calculate_stepheightvec() { stepheightvec = autocvar_sv_stepheight * '0 0 1'; jumpstepheightvec = stepheightvec + diff --git a/qcsrc/server/bot/bot.qh b/qcsrc/server/bot/bot.qh index 2ae70728a..12cd763e1 100644 --- a/qcsrc/server/bot/bot.qh +++ b/qcsrc/server/bot/bot.qh @@ -114,5 +114,5 @@ void bot_serverframe(); void() havocbot_setupbot; -void bot_calculate_stepheightvec(void); +void bot_calculate_stepheightvec(); #endif diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 38203f52e..6cf716107 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -708,7 +708,7 @@ void ClientInit_Spawn() SetNewParms ============= */ -void SetNewParms (void) +void SetNewParms () { // initialize parms for a new player parm1 = -(86400 * 366); @@ -721,7 +721,7 @@ void SetNewParms (void) SetChangeParms ============= */ -void SetChangeParms (void) +void SetChangeParms () {SELFPARAM(); // save parms for level change parm1 = self.parm_idlesince - time; @@ -734,7 +734,7 @@ void SetChangeParms (void) DecodeLevelParms ============= */ -void DecodeLevelParms (void) +void DecodeLevelParms () {SELFPARAM(); // load parms self.parm_idlesince = parm1; @@ -937,7 +937,7 @@ void ClientKill_TeamChange (float targetteam) // 0 = don't change, -1 = auto, -2 } -void ClientKill (void) +void ClientKill () {SELFPARAM(); if(gameover) return; if(self.player_blocked) return; @@ -985,7 +985,7 @@ ClientPreConnect Called once (not at each match start) when a client begins a connection to the server ============= */ -void ClientPreConnect (void) +void ClientPreConnect () {SELFPARAM(); if(autocvar_sv_eventlog) { @@ -1005,8 +1005,8 @@ ClientConnect Called when a client connects to the server ============= */ -void DecodeLevelParms (void); -void ClientConnect (void) +void DecodeLevelParms (); +void ClientConnect () {SELFPARAM(); float t; @@ -1224,7 +1224,7 @@ Called when a client disconnects from the server */ .entity chatbubbleentity; void ReadyCount(); -void ClientDisconnect (void) +void ClientDisconnect () {SELFPARAM(); if(self.vehicle) vehicles_exit(VHEF_RELEASE); @@ -1372,7 +1372,7 @@ void UpdateChatBubble() else self.colormod = '1 1 1'; }*/ -void respawn(void) +void respawn() {SELFPARAM(); if(self.alpha >= 0 && autocvar_g_respawn_ghosts) { @@ -1401,7 +1401,7 @@ void play_countdown(float finished, string samp) _sound (self, CH_INFO, samp, VOL_BASE, ATTEN_NORM); } -void player_powerups (void) +void player_powerups () {SELFPARAM(); // add a way to see what the items were BEFORE all of these checks for the mutator hook int items_prev = self.items; @@ -1564,7 +1564,7 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re return current; } -void player_regen (void) +void player_regen () {SELFPARAM(); float max_mod, regen_mod, rot_mod, limit_mod; max_mod = regen_mod = rot_mod = limit_mod = 1; @@ -2176,7 +2176,7 @@ Called every frame for each client before the physics are run void() nexball_setstatus; .float last_vehiclecheck; .int items_added; -void PlayerPreThink (void) +void PlayerPreThink () {SELFPARAM(); WarpZone_PlayerPhysics_FixVAngle(); @@ -2565,7 +2565,7 @@ Called every frame for each client after the physics are run ============= */ .float idlekick_lasttimeleft; -void PlayerPostThink (void) +void PlayerPostThink () {SELFPARAM(); if(sv_maxidle > 0 && frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero). if(IS_REAL_CLIENT(self)) diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index 9b4e61eed..58f1a9bd3 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -54,7 +54,7 @@ * 230 to 253: individual weapons (up to 24) */ -void ImpulseCommands (void) +void ImpulseCommands () {SELFPARAM(); int imp; vector org; diff --git a/qcsrc/server/cl_impulse.qh b/qcsrc/server/cl_impulse.qh index ced811946..3a5ed9ecd 100644 --- a/qcsrc/server/cl_impulse.qh +++ b/qcsrc/server/cl_impulse.qh @@ -36,5 +36,5 @@ * 230 to 253: individual weapons (up to 24) */ -void ImpulseCommands (void); +void ImpulseCommands (); #endif diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index dd70c31dd..d6aa84ea1 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -34,7 +34,7 @@ void Drop_Special_Items(entity player) MUTATOR_CALLHOOK(DropSpecialItems, player); } -void CopyBody_Think(void) +void CopyBody_Think() {SELFPARAM(); if(self.CopyBody_nextthink && time > self.CopyBody_nextthink) { @@ -142,7 +142,7 @@ void player_setupanimsformodel() animdecide_setstate(self, 0, false); } -void player_anim (void) +void player_anim () {SELFPARAM(); int deadbits = (self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2)); if(self.deadflag) { diff --git a/qcsrc/server/cl_player.qh b/qcsrc/server/cl_player.qh index 27d1bd0dd..c96399f19 100644 --- a/qcsrc/server/cl_player.qh +++ b/qcsrc/server/cl_player.qh @@ -6,15 +6,15 @@ .float istypefrag; .float CopyBody_nextthink; -.void(void) CopyBody_think; -void CopyBody_Think(void); +.void() CopyBody_think; +void CopyBody_Think(); void CopyBody(float keepvelocity); float player_getspecies(); void player_setupanimsformodel(); -void player_anim (void); +void player_anim (); void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force); diff --git a/qcsrc/server/command/getreplies.qh b/qcsrc/server/command/getreplies.qh index bf37153c4..a0f9b21ef 100644 --- a/qcsrc/server/command/getreplies.qh +++ b/qcsrc/server/command/getreplies.qh @@ -16,9 +16,9 @@ float top_scores[LADDER_SIZE]; // allow functions to be used in other code like g_world.qc and race.qc string getrecords(float page); -string getrankings(void); -string getladder(void); -string getmaplist(void); -string getlsmaps(void); -string getmonsterlist(void); +string getrankings(); +string getladder(); +string getmaplist(); +string getlsmaps(); +string getmonsterlist(); #endif diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 727513f7a..eec862f36 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -31,7 +31,7 @@ #include "../../common/monsters/sv_monsters.qh" -void PutObserverInServer(void); +void PutObserverInServer(); // ===================================================== // Server side game commands code, reworked by Samual diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index b3e8ec985..99bd81949 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -80,7 +80,7 @@ void RemoveGrapplingHook(entity pl) //pl.disableclientprediction = false; } -void GrapplingHookReset(void) +void GrapplingHookReset() {SELFPARAM(); if(self.realowner.hook == self) RemoveGrapplingHook(self.owner); @@ -299,7 +299,7 @@ void GrapplingHookThink() } } -void GrapplingHookTouch (void) +void GrapplingHookTouch () {SELFPARAM(); if(other.movetype == MOVETYPE_FOLLOW) return; @@ -339,7 +339,7 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int } } -void FireGrapplingHook (void) +void FireGrapplingHook () {SELFPARAM(); entity missile; vector org; diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc index 5a361a7a8..46ebe5ed8 100644 --- a/qcsrc/server/g_models.qc +++ b/qcsrc/server/g_models.qc @@ -15,7 +15,7 @@ class(BGMScript) .float bgmscriptrelease; .float modelscale; -void g_model_setcolormaptoactivator (void) +void g_model_setcolormaptoactivator () {SELFPARAM(); if(teamplay) { @@ -29,13 +29,13 @@ void g_model_setcolormaptoactivator (void) self.colormap |= BIT(10); // RENDER_COLORMAPPED } -void g_clientmodel_setcolormaptoactivator (void) +void g_clientmodel_setcolormaptoactivator () {SELFPARAM(); g_model_setcolormaptoactivator(); self.SendFlags |= (BIT(3) | BIT(0)); } -void g_clientmodel_use(void) +void g_clientmodel_use() {SELFPARAM(); if (self.antiwall_flag == 1) { diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 41bac7a43..f2e3da898 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -62,7 +62,7 @@ main unused but required by the engine ================== */ -void main (void) +void main () { } diff --git a/qcsrc/server/g_subs.qh b/qcsrc/server/g_subs.qh index 149324f6d..a50885a7f 100644 --- a/qcsrc/server/g_subs.qh +++ b/qcsrc/server/g_subs.qh @@ -1,7 +1,7 @@ #ifndef G_SUBS_H #define G_SUBS_H -void SUB_NullThink(void); +void SUB_NullThink(); void() SUB_CalcMoveDone; void() SUB_CalcAngleMoveDone; @@ -21,7 +21,7 @@ SUB_Remove Remove self ================== */ -void SUB_Remove (void); +void SUB_Remove (); /* ================== @@ -31,7 +31,7 @@ Applies some friction to self ================== */ .float friction; -void SUB_Friction (void); +void SUB_Friction (); /* ================== @@ -42,7 +42,7 @@ Makes client invisible or removes non-client */ void SUB_VanishOrRemove (entity ent); -void SUB_SetFade_Think (void); +void SUB_SetFade_Think (); /* ================== @@ -61,10 +61,10 @@ calculate self.velocity and self.nextthink to reach dest from self.origin traveling at speed =============== */ -void SUB_CalcMoveDone (void); +void SUB_CalcMoveDone (); .float platmovetype_turn; -void SUB_CalcMove_controller_think (void); +void SUB_CalcMove_controller_think (); void SUB_CalcMove_controller_setbezier (entity controller, vector org, vector control, vector dest); @@ -86,7 +86,7 @@ self.angles rotating The calling function should make sure self.think is valid =============== */ -void SUB_CalcAngleMoveDone (void); +void SUB_CalcAngleMoveDone (); // FIXME: I fixed this function only for rotation around the main axes void SUB_CalcAngleMove (vector destangle, float tspeedtype, float tspeed, void() func); @@ -100,7 +100,7 @@ main unused but required by the engine ================== */ -void main (void); +void main (); // Misc diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 0b8c14fa1..aea8b4876 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1650,7 +1650,7 @@ void AddWinners(.float field, float value) } // clear the .winning flags -void ClearWinners(void) +void ClearWinners() { entity head; FOR_EACH_PLAYER(head) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index cb7c66f02..623387b57 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -52,7 +52,7 @@ void WarpZone_crosshair_trace(entity pl) } -string admin_name(void) +string admin_name() { if(autocvar_sv_adminnick != "") return autocvar_sv_adminnick; @@ -1082,7 +1082,7 @@ void remove_safely(entity e) builtin_remove(e); } -void InitializeEntity(entity e, void(void) func, float order) +void InitializeEntity(entity e, void() func, float order) { entity prev, cur; diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 2be5a9e22..c857c2dc3 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -33,7 +33,7 @@ float cvar_normal(string n) entity eliminatedPlayers; void EliminatedPlayers_Init(float(entity) isEliminated_func); -string admin_name(void); +string admin_name(); void write_recordmarker(entity pl, float tstart, float dt); @@ -297,7 +297,7 @@ float sv_autotaunt; float sv_taunt; string GetGametype(); // g_world.qc -void readlevelcvars(void) +void readlevelcvars() { if(cvar("sv_allow_fullbright")) serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT; @@ -438,7 +438,7 @@ const float INITPRIO_SETLOCATION = 90; const float INITPRIO_LINKDOORS = 91; const float INITPRIO_LAST = 99; -.void(void) initialize_entity; +.void() initialize_entity; .float initialize_entity_order; .entity initialize_entity_next; entity initialize_entity_first; @@ -448,7 +448,7 @@ entity initialize_entity_first; float sound_allowed(float dest, entity e); -void InitializeEntity(entity e, void(void) func, float order); -void SetCustomizer(entity e, float(void) customizer, void(void) uncustomizer); +void InitializeEntity(entity e, void() func, float order); +void SetCustomizer(entity e, float() customizer, void() uncustomizer); #endif diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qc b/qcsrc/server/mutators/mutator/gamemode_ctf.qc index 8ab76c840..eda9f1628 100644 --- a/qcsrc/server/mutators/mutator/gamemode_ctf.qc +++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qc @@ -936,7 +936,7 @@ bool ctf_Stalemate_Customize() return true; } -void ctf_CheckStalemate(void) +void ctf_CheckStalemate() { // declarations int stale_flags = 0, stale_red_flags = 0, stale_blue_flags = 0, stale_yellow_flags = 0, stale_pink_flags = 0, stale_neutral_flags = 0; @@ -1330,7 +1330,7 @@ void ctf_Reset() ctf_RespawnFlag(self); } -void ctf_DelayedFlagSetup(void) // called after a flag is placed on a map by ctf_FlagSetup() +void ctf_DelayedFlagSetup() // called after a flag is placed on a map by ctf_FlagSetup() {SELFPARAM(); // bot waypoints waypoint_spawnforitem_force(self, self.origin); diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc index 341d13308..8eea91758 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@ -45,7 +45,7 @@ float kh_tracking_enabled; .entity kh_next; float kh_Key_AllOwnedByWhichTeam(); -typedef void(void) kh_Think_t; +typedef void() kh_Think_t; void kh_StartRound(); void kh_Controller_SetThink(float t, kh_Think_t func); diff --git a/qcsrc/server/mutators/mutator/gamemode_onslaught.qc b/qcsrc/server/mutators/mutator/gamemode_onslaught.qc index aa9969a11..7540b3233 100644 --- a/qcsrc/server/mutators/mutator/gamemode_onslaught.qc +++ b/qcsrc/server/mutators/mutator/gamemode_onslaught.qc @@ -872,7 +872,7 @@ void ons_ControlPoint_Reset() CSQCMODEL_AUTOUPDATE(self); } -void ons_DelayedControlPoint_Setup(void) +void ons_DelayedControlPoint_Setup() {SELFPARAM(); onslaught_updatelinks(); diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 34e30c805..2eca07bc9 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -927,7 +927,7 @@ void PlayerScore_PlayerStats(entity p) PS_GR_P_ADDVAL(s.owner, strcat(PLAYERSTATS_SCOREBOARD, scores_label[i]), s.(scores[i])); } -void PlayerScore_TeamStats(void) +void PlayerScore_TeamStats() { entity sk; float t, i; diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 7dbc6148a..09c9263d7 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -28,7 +28,7 @@ .float lastground; .int state; -void CreatureFrame (void) +void CreatureFrame () {SELFPARAM(); float dm; @@ -423,7 +423,7 @@ void SV_OnEntityPreSpawnFunction() } } -void WarpZone_PostInitialize_Callback(void) +void WarpZone_PostInitialize_Callback() { // create waypoint links for warpzones entity e; diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 5174943c6..2a594c11f 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -436,7 +436,7 @@ float Item_ItemsTime_UpdateTime(entity e, float t); void Item_ItemsTime_SetTime(entity e, float t); void Item_ItemsTime_SetTimesForAllPlayers(); -void Item_Respawn (void) +void Item_Respawn () {SELFPARAM(); Item_Show(self, 1); // this is ugly... @@ -462,7 +462,7 @@ void Item_Respawn (void) Send_Effect(EFFECT_ITEM_RESPAWN, CENTER_OR_VIEWOFS(self), '0 0 0', 1); } -void Item_RespawnCountdown (void) +void Item_RespawnCountdown () {SELFPARAM(); if(self.count >= ITEM_RESPAWN_TICKS) { @@ -845,7 +845,7 @@ void Item_FindTeam() // Savage: used for item garbage-collection // TODO: perhaps nice special effect? -void RemoveItem(void) +void RemoveItem() {SELFPARAM(); if(wasfreed(self) || !self) { return; } Send_Effect(EFFECT_ITEM_PICKUP, CENTER_OR_VIEWOFS(self), '0 0 0', 1); diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh index f353f2589..125fca4db 100644 --- a/qcsrc/server/t_items.qh +++ b/qcsrc/server/t_items.qh @@ -74,9 +74,9 @@ const float ITEM_RESPAWN_TICKS = 10; void Item_Show (entity e, float mode); -void Item_Respawn (void); +void Item_Respawn (); -void Item_RespawnCountdown (void); +void Item_RespawnCountdown (); void Item_ScheduleRespawnIn(entity e, float t); void Item_ScheduleRespawn(entity e); @@ -115,7 +115,7 @@ float commodity_pickupevalfunc(entity player, entity item); void _StartItem(entity this, entity def, float defaultrespawntime, float defaultrespawntimejitter); -void target_items_use (void); +void target_items_use (); const float OP_SET = 0; const float OP_MIN = 1; diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index f5889a8cc..1a75bf404 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -114,7 +114,7 @@ string GetClientVersionMessage() return versionmsg; } -string getwelcomemessage(void) +string getwelcomemessage() { string s, modifications, motd; diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh index b93499323..6b3bdf0f2 100644 --- a/qcsrc/server/teamplay.qh +++ b/qcsrc/server/teamplay.qh @@ -27,7 +27,7 @@ void InitGameplayMode(); string GetClientVersionMessage(); -string getwelcomemessage(void); +string getwelcomemessage(); void SetPlayerColors(entity pl, float _color); diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index 48a2d966e..cfa68dc99 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -307,7 +307,7 @@ void W_PreviousWeapon(float list) } // previously used if exists and has ammo, (second) best otherwise -void W_LastWeapon(void) +void W_LastWeapon() {SELFPARAM(); if(client_hasweapon(self, self.cnt, true, false)) W_SwitchWeapon(self.cnt); diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh index 69f644c70..d51addd7d 100644 --- a/qcsrc/server/weapons/selection.qh +++ b/qcsrc/server/weapons/selection.qh @@ -29,5 +29,5 @@ void W_NextWeapon(float list); void W_PreviousWeapon(float list); // previously used if exists and has ammo, (second) best otherwise -void W_LastWeapon(void); +void W_LastWeapon(); #endif