From 3a264e945a45a04f4566feb9e9a91e0d5266361e Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Mon, 10 Oct 2011 16:44:54 +0200 Subject: [PATCH] Get rid of unnessesary traling ;'s (as in fucntions ending with }; ) --- qcsrc/client/Main.qc | 6 +- qcsrc/client/ctf.qc | 16 +-- qcsrc/client/hud.qc | 2 +- qcsrc/client/teamradar.qc | 2 +- qcsrc/common/util.qc | 4 +- qcsrc/menu/item/borderimage.c | 2 +- qcsrc/menu/item/container.c | 2 +- qcsrc/menu/item/modalcontroller.c | 2 +- qcsrc/menu/item/nexposee.c | 2 +- qcsrc/menu/menu.qc | 18 +-- qcsrc/server/bot/aim.qc | 16 +-- qcsrc/server/bot/bot.qc | 20 ++-- qcsrc/server/bot/havocbot/havocbot.qc | 16 +-- qcsrc/server/bot/havocbot/role_assault.qc | 10 +- qcsrc/server/bot/havocbot/role_ctf.qc | 40 +++---- qcsrc/server/bot/havocbot/role_freezetag.qc | 8 +- qcsrc/server/bot/havocbot/role_keepaway.qc | 8 +- qcsrc/server/bot/havocbot/role_keyhunt.qc | 10 +- qcsrc/server/bot/havocbot/role_onslaught.qc | 20 ++-- qcsrc/server/bot/havocbot/roles.qc | 20 ++-- qcsrc/server/bot/navigation.qc | 24 ++-- qcsrc/server/bot/waypoints.qc | 38 +++--- qcsrc/server/cl_client.qc | 6 +- qcsrc/server/cl_physics.qc | 4 +- qcsrc/server/cl_player.qc | 2 +- qcsrc/server/cl_weapons.qc | 10 +- qcsrc/server/cl_weaponsystem.qc | 20 ++-- qcsrc/server/ctf.qc | 60 +++++----- qcsrc/server/domination.qc | 20 ++-- qcsrc/server/ent_cs.qc | 10 +- qcsrc/server/extensions.qh | 18 +-- qcsrc/server/func_breakable.qc | 2 +- qcsrc/server/g_lights.qc | 10 +- qcsrc/server/g_subs.qc | 14 +-- qcsrc/server/g_tetris.qc | 40 +++---- qcsrc/server/g_triggers.qc | 50 ++++---- qcsrc/server/g_world.qc | 18 +-- qcsrc/server/gamecommand.qc | 2 +- qcsrc/server/miscfunctions.qc | 6 +- qcsrc/server/mode_onslaught.qc | 40 +++---- qcsrc/server/monsters/ai.qc | 56 ++++----- qcsrc/server/monsters/fight.qc | 12 +- qcsrc/server/monsters/m_monsters.qc | 24 ++-- qcsrc/server/nexball.qc | 2 +- qcsrc/server/t_halflife.qc | 60 +++++----- qcsrc/server/t_items.qc | 6 +- qcsrc/server/t_jumppads.qc | 12 +- qcsrc/server/t_plats.qc | 126 ++++++++++---------- qcsrc/server/t_quake3.qc | 2 +- qcsrc/server/t_swamp.qc | 2 +- qcsrc/server/target_spawn.qc | 2 +- qcsrc/server/teamplay.qc | 8 +- qcsrc/server/w_crylink.qc | 2 +- qcsrc/server/w_electro.qc | 2 +- qcsrc/server/w_fireball.qc | 2 +- qcsrc/server/w_grenadelauncher.qc | 2 +- qcsrc/server/w_hagar.qc | 2 +- qcsrc/server/w_hlac.qc | 4 +- qcsrc/server/w_hook.qc | 2 +- qcsrc/server/w_laser.qc | 2 +- qcsrc/server/w_minelayer.qc | 2 +- qcsrc/server/w_minstanex.qc | 2 +- qcsrc/server/w_nex.qc | 2 +- qcsrc/server/w_porto.qc | 2 +- qcsrc/server/w_rifle.qc | 2 +- qcsrc/server/w_rocketlauncher.qc | 2 +- qcsrc/server/w_seeker.qc | 2 +- qcsrc/server/w_shotgun.qc | 2 +- qcsrc/server/w_tuba.qc | 2 +- qcsrc/server/w_uzi.qc | 2 +- 70 files changed, 484 insertions(+), 484 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 5bd490424..74633c558 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -28,14 +28,14 @@ void cvar_clientsettemp_restore() void() menu_show_error = { drawstring('0 200 0', _("ERROR - MENU IS VISIBLE BUT NO MENU WAS DEFINED!"), '8 8 0', '1 0 0', 1, 0); -}; +} // CSQC_Init : Called every time the CSQC code is initialized (essentially at map load) // Useful for precaching things void() menu_sub_null = { -}; +} #ifdef USE_FTE float __engine_check; @@ -1007,7 +1007,7 @@ void(float bIsNewEntity) CSQC_Ent_Update = } time = savetime; -}; +} // Destructor, but does NOT deallocate the entity by calling remove(). Also // used when an entity changes its type. For an entity that someone interacts // with others, make sure it can no longer do so. diff --git a/qcsrc/client/ctf.qc b/qcsrc/client/ctf.qc index b940754be..aecef1a33 100644 --- a/qcsrc/client/ctf.qc +++ b/qcsrc/client/ctf.qc @@ -19,7 +19,7 @@ void() menu_close = strunzone(ctf_temp_1);*/ localcmd("\nin_bindmap 0 0;"); -}; +} void() order_menu_render = { @@ -56,7 +56,7 @@ void() order_menu_render = } else { menu_close(); } -}; +} float(float bInputType, float nPrimary, float nSecondary) order_menu_action = { @@ -134,14 +134,14 @@ float(float bInputType, float nPrimary, float nSecondary) order_menu_action = return FALSE; } return TRUE; -}; +} void() order_menu_show = { order_page = 0; menu_show = order_menu_render; menu_action = order_menu_action; -}; +} void() ctf_menu_render = @@ -162,7 +162,7 @@ void() ctf_menu_render = } else { menu_close(); } -}; +} float(float bInputType, float nPrimary, float nSecondary) ctf_menu_action = { @@ -188,7 +188,7 @@ float(float bInputType, float nPrimary, float nSecondary) ctf_menu_action = return FALSE; } return TRUE; -}; +} void() ctf_menu_show = { @@ -198,7 +198,7 @@ void() ctf_menu_show = menu_action = ctf_menu_action; menu_visible = TRUE; //menu_default_binds(); -}; +} void() ctf_view = { @@ -214,6 +214,6 @@ void() ctf_view = } else { drawstring('0 0 0', _("Awaiting orders..."), '8 8 0', '1 1 1', 0.5, 0); } -}; +} #endif diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 04060dbd0..7b843d973 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2460,7 +2460,7 @@ void HUD_Radar(void) draw_teamradar_player(view_origin, view_angles, '1 1 1'); drawresetcliparea(); -}; +} // Score (#7) // diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 852b36092..e499b5871 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -117,7 +117,7 @@ void(vector coord3d, vector pangles, vector rgb) draw_teamradar_player = R_PolygonVertex(coord-v_forward, '1 0 0', rgb, panel_fg_alpha); R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, panel_fg_alpha); R_EndPolygon(); -}; +} void draw_teamradar_icon(vector coord, float icon, entity pingdata, vector rgb, float a) { diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index d02fa1e2c..c3407757a 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1143,10 +1143,10 @@ string rgb_to_hexcolor(vector rgb) } // requires that m2>m1 in all coordinates, and that m4>m3 -float boxesoverlap(vector m1, vector m2, vector m3, vector m4) {return m2_x >= m3_x && m1_x <= m4_x && m2_y >= m3_y && m1_y <= m4_y && m2_z >= m3_z && m1_z <= m4_z;}; +float boxesoverlap(vector m1, vector m2, vector m3, vector m4) {return m2_x >= m3_x && m1_x <= m4_x && m2_y >= m3_y && m1_y <= m4_y && m2_z >= m3_z && m1_z <= m4_z;} // requires the same, but is a stronger condition -float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) {return smins_x >= bmins_x && smaxs_x <= bmaxs_x && smins_y >= bmins_y && smaxs_y <= bmaxs_y && smins_z >= bmins_z && smaxs_z <= bmaxs_z;}; +float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) {return smins_x >= bmins_x && smaxs_x <= bmaxs_x && smins_y >= bmins_y && smaxs_y <= bmaxs_y && smins_z >= bmins_z && smaxs_z <= bmaxs_z;} #ifndef MENUQC #endif diff --git a/qcsrc/menu/item/borderimage.c b/qcsrc/menu/item/borderimage.c index b23078bae..bdeed2bb1 100644 --- a/qcsrc/menu/item/borderimage.c +++ b/qcsrc/menu/item/borderimage.c @@ -85,5 +85,5 @@ void BorderImage_draw(entity me) draw_fontscale = df; } } -}; +} #endif diff --git a/qcsrc/menu/item/container.c b/qcsrc/menu/item/container.c index d10e6a486..5e924a0ee 100644 --- a/qcsrc/menu/item/container.c +++ b/qcsrc/menu/item/container.c @@ -177,7 +177,7 @@ void Container_draw(entity me) e.draw(e); me.leaveSubitem(me); } -}; +} void Container_focusLeave(entity me) { diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c index 82bd6f62b..4f1ff4e9e 100644 --- a/qcsrc/menu/item/modalcontroller.c +++ b/qcsrc/menu/item/modalcontroller.c @@ -227,7 +227,7 @@ void ModalController_draw(entity me) else me.setFocus(me, front); SUPER(ModalController).draw(me); -}; +} void ModalController_addTab(entity me, entity other, entity tabButton) { diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c index 304bf1dd2..02f122425 100644 --- a/qcsrc/menu/item/nexposee.c +++ b/qcsrc/menu/item/nexposee.c @@ -209,7 +209,7 @@ void Nexposee_draw(entity me) } SUPER(Nexposee).draw(me); -}; +} float Nexposee_mousePress(entity me, vector pos) { diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 36973c96f..fe3753d84 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -16,7 +16,7 @@ float menuInitialized; float menuNotTheFirstFrame; float menuMouseMode; -void SUB_Null() { }; +void SUB_Null() { } void() m_init = { @@ -171,7 +171,7 @@ void() m_init_delayed = if(Menu_Active) m_display(); // delayed menu display -}; +} void(float key, float ascii) m_keyup = { @@ -195,7 +195,7 @@ void(float key, float ascii) m_keyup = if(key == K_ALT) menuShiftState -= (menuShiftState & S_ALT); if(key == K_CTRL) menuShiftState -= (menuShiftState & S_CTRL); if(key == K_SHIFT) menuShiftState -= (menuShiftState & S_SHIFT); -}; +} void(float key, float ascii) m_keydown = { @@ -233,7 +233,7 @@ void(float key, float ascii) m_keydown = if(key == K_ALT) menuShiftState |= S_ALT; if(key == K_CTRL) menuShiftState |= S_CTRL; if(key == K_SHIFT) menuShiftState |= S_SHIFT; -}; +} float SCALEMODE_CROP = 0; float SCALEMODE_LETTERBOX = 1; @@ -777,7 +777,7 @@ void() m_draw = postMenuDraw(); frametime = 0; -}; +} void() m_display = { @@ -794,7 +794,7 @@ void() m_display = main.focusEnter(main); main.showNotify(main); -}; +} void() m_hide = { @@ -807,7 +807,7 @@ void() m_hide = main.focusLeave(main); main.hideNotify(main); -}; +} void() m_toggle = { @@ -815,7 +815,7 @@ void() m_toggle = m_hide(); else m_display(); -}; +} void() m_shutdown = { @@ -828,7 +828,7 @@ void() m_shutdown = if(e.destroy) e.destroy(e); } -}; +} void m_focus_item_chain(entity outermost, entity innermost) { diff --git a/qcsrc/server/bot/aim.qc b/qcsrc/server/bot/aim.qc index 8a728437a..3bff21ecf 100644 --- a/qcsrc/server/bot/aim.qc +++ b/qcsrc/server/bot/aim.qc @@ -78,7 +78,7 @@ float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, f // leave a valid one even if it won't reach findtrajectory_velocity = normalize(end - org) * shotspeed + shotspeedupward * '0 0 1'; return FALSE; -}; +} void lag_update() { @@ -87,7 +87,7 @@ void lag_update() if (self.lag3_time) if (time > self.lag3_time) {self.lag_func(self.lag3_time, self.lag3_float1, self.lag3_float2, self.lag3_entity1, self.lag3_vec1, self.lag3_vec2, self.lag3_vec3, self.lag3_vec4);self.lag3_time = 0;} if (self.lag4_time) if (time > self.lag4_time) {self.lag_func(self.lag4_time, self.lag4_float1, self.lag4_float2, self.lag4_entity1, self.lag4_vec1, self.lag4_vec2, self.lag4_vec3, self.lag4_vec4);self.lag4_time = 0;} if (self.lag5_time) if (time > self.lag5_time) {self.lag_func(self.lag5_time, self.lag5_float1, self.lag5_float2, self.lag5_entity1, self.lag5_vec1, self.lag5_vec2, self.lag5_vec3, self.lag5_vec4);self.lag5_time = 0;} -}; +} float lag_additem(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4) { @@ -98,7 +98,7 @@ float lag_additem(float t, float f1, float f2, entity e1, vector v1, vector v2, if (self.lag5_time == 0) {self.lag5_time = t;self.lag5_float1 = f1;self.lag5_float2 = f2;self.lag5_entity1 = e1;self.lag5_vec1 = v1;self.lag5_vec2 = v2;self.lag5_vec3 = v3;self.lag5_vec4 = v4;return TRUE;} // no room for it (what is the best thing to do here??) return FALSE; -}; +} float bot_shouldattack(entity e) { @@ -142,7 +142,7 @@ float bot_shouldattack(entity e) if(e.flags & FL_NOTARGET) return FALSE; return TRUE; -}; +} void bot_lagfunc(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4) { @@ -165,7 +165,7 @@ void bot_lagfunc(float t, float f1, float f2, entity e1, vector v1, vector v2, v self.bot_canfire = (random() < 0.95); else self.bot_canfire = 1; -}; +} float bot_aimdir(vector v, float maxfiredeviation) { @@ -310,13 +310,13 @@ float bot_aimdir(vector v, float maxfiredeviation) //dprint(" diff:", vtos(diffang), "\n"); return self.bot_canfire && (time < self.bot_firetimer); -}; +} vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, float shotdelay) { // Try to add code here that predicts gravity effect here, no clue HOW to though ... well not yet atleast... return targorigin + targvelocity * (shotdelay + vlen(targorigin - shotorg) / shotspeed); -}; +} float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { @@ -387,4 +387,4 @@ float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float a // return FALSE; self.dphitcontentsmask = hf; return TRUE; -}; +} diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc index 8368a0df9..1b6d8eb4e 100644 --- a/qcsrc/server/bot/bot.qc +++ b/qcsrc/server/bot/bot.qc @@ -25,7 +25,7 @@ entity bot_spawn() self = oldself; } return bot; -}; +} void bot_think() { @@ -103,7 +103,7 @@ void bot_think() // now call the current bot AI (havocbot for example) self.bot_ai(); -}; +} void bot_setnameandstuff() { @@ -235,7 +235,7 @@ void bot_setnameandstuff() self.cvar_cl_accuracy_data_share = 1; // share the bots weapon accuracy data with the world self.cvar_cl_accuracy_data_receive = 0; // don't receive any weapon accuracy data -}; +} void bot_custom_weapon_priority_setup() { @@ -312,7 +312,7 @@ void bot_custom_weapon_priority_setup() bot_weapons_close[c] = -1; bot_custom_weapon = TRUE; -}; +} void bot_endgame() { @@ -325,7 +325,7 @@ void bot_endgame() e = e.nextbot; } // if dynamic waypoints are ever implemented, save them here -}; +} void bot_relinkplayerlist() { @@ -357,7 +357,7 @@ void bot_relinkplayerlist() dprint(strcat("relink: ", ftos(currentbots), " bots seen.\n")); bot_strategytoken = bot_list; bot_strategytoken_taken = TRUE; -}; +} void bot_clientdisconnect() { @@ -405,7 +405,7 @@ void bot_clientconnect() JoinBestTeam(self, FALSE, TRUE); havocbot_setupbot(); -}; +} void bot_removefromlargestteam() { @@ -446,7 +446,7 @@ void bot_removefromlargestteam() } currentbots = currentbots - 1; dropclient(best); -}; +} void bot_removenewest() { @@ -475,7 +475,7 @@ void bot_removenewest() } currentbots = currentbots - 1; dropclient(best); -}; +} void autoskill(float factor) { @@ -680,4 +680,4 @@ void bot_serverframe() bot_custom_weapon_priority_setup(); bot_cvar_nextthink = time + 5; } -}; +} diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc index b4cb4aa08..9b7198cef 100644 --- a/qcsrc/server/bot/havocbot/havocbot.qc +++ b/qcsrc/server/bot/havocbot/havocbot.qc @@ -173,7 +173,7 @@ void havocbot_ai() } } } -}; +} void havocbot_keyboard_movement(vector destorg) { @@ -248,7 +248,7 @@ void havocbot_keyboard_movement(vector destorg) blend = bound(0,vlen(destorg-self.origin)/autocvar_bot_ai_keyboard_distance,1); // When getting close move with 360 degree //dprint("movement ", vtos(self.movement), " keyboard ", vtos(keyboard), " blend ", ftos(blend), "\n"); self.movement = self.movement + (keyboard - self.movement) * blend; -}; +} void havocbot_bunnyhop(vector dir) { @@ -394,7 +394,7 @@ void havocbot_bunnyhop(vector dir) } } #endif -}; +} void havocbot_movetogoal() { @@ -851,7 +851,7 @@ void havocbot_movetogoal() if ((dir * v_up) >= autocvar_sv_jumpvelocity*0.5 && (self.flags & FL_ONGROUND)) self.BUTTON_JUMP=1; if (((dodge * v_up) > 0) && random()*frametime >= 0.2*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.BUTTON_JUMP=TRUE; if (((dodge * v_up) < 0) && random()*frametime >= 0.5*bound(0,(10-skill-self.bot_dodgeskill)*0.1,1)) self.havocbot_ducktime=time+0.3/bound(0.1,skill+self.bot_dodgeskill,10); -}; +} void havocbot_chooseenemy() { @@ -947,7 +947,7 @@ void havocbot_chooseenemy() self.enemy = best; self.havocbot_stickenemy = TRUE; -}; +} float havocbot_chooseweapon_checkreload(float new_weapon) { @@ -1074,7 +1074,7 @@ void havocbot_chooseweapon() } } } -}; +} void havocbot_aim() { @@ -1096,7 +1096,7 @@ void havocbot_aim() } else lag_additem(time + self.ping, 0, 0, world, self.origin, selfvel, ( self.goalcurrent.absmin + self.goalcurrent.absmax ) * 0.5, '0 0 0'); -}; +} float havocbot_moveto_refresh_route() { @@ -1290,4 +1290,4 @@ vector havocbot_dodge() } return dodge; #endif -}; +} diff --git a/qcsrc/server/bot/havocbot/role_assault.qc b/qcsrc/server/bot/havocbot/role_assault.qc index 6f0f3e2c0..4456802d5 100644 --- a/qcsrc/server/bot/havocbot/role_assault.qc +++ b/qcsrc/server/bot/havocbot/role_assault.qc @@ -135,7 +135,7 @@ void havocbot_role_ast_offense() self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; } -}; +} void havocbot_role_ast_defense() { @@ -169,7 +169,7 @@ void havocbot_role_ast_defense() self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; } -}; +} void havocbot_role_ast_setrole(entity bot, float role) { @@ -186,7 +186,7 @@ void havocbot_role_ast_setrole(entity bot, float role) bot.havocbot_role_timeout = 0; break; } -}; +} void havocbot_ast_reset_role(entity bot) { @@ -197,9 +197,9 @@ void havocbot_ast_reset_role(entity bot) havocbot_role_ast_setrole(bot, HAVOCBOT_AST_ROLE_OFFENSE); else havocbot_role_ast_setrole(bot, HAVOCBOT_AST_ROLE_DEFENSE); -}; +} void havocbot_chooserole_ast() { havocbot_ast_reset_role(self); -}; +} diff --git a/qcsrc/server/bot/havocbot/role_ctf.qc b/qcsrc/server/bot/havocbot/role_ctf.qc index 8e413bbfe..74c611ea1 100644 --- a/qcsrc/server/bot/havocbot/role_ctf.qc +++ b/qcsrc/server/bot/havocbot/role_ctf.qc @@ -40,7 +40,7 @@ entity havocbot_ctf_find_flag(entity bot) f = f.ctf_worldflagnext; } return world; -}; +} entity havocbot_ctf_find_enemy_flag(entity bot) { @@ -53,7 +53,7 @@ entity havocbot_ctf_find_enemy_flag(entity bot) f = f.ctf_worldflagnext; } return world; -}; +} float havocbot_ctf_teamcount(entity bot, vector org, float radius) { @@ -73,7 +73,7 @@ float havocbot_ctf_teamcount(entity bot, vector org, float radius) } return c; -}; +} void havocbot_goalrating_ctf_ourflag(float ratingscale) { @@ -87,7 +87,7 @@ void havocbot_goalrating_ctf_ourflag(float ratingscale) } if (head) navigation_routerating(head, ratingscale, 10000); -}; +} void havocbot_goalrating_ctf_ourbase(float ratingscale) { @@ -103,7 +103,7 @@ void havocbot_goalrating_ctf_ourbase(float ratingscale) return; navigation_routerating(head.basewaypoint, ratingscale, 10000); -}; +} void havocbot_goalrating_ctf_enemyflag(float ratingscale) { @@ -117,7 +117,7 @@ void havocbot_goalrating_ctf_enemyflag(float ratingscale) } if (head) navigation_routerating(head, ratingscale, 10000); -}; +} void havocbot_goalrating_ctf_enemybase(float ratingscale) { @@ -135,7 +135,7 @@ void havocbot_goalrating_ctf_enemybase(float ratingscale) return; navigation_routerating(head.basewaypoint, ratingscale, 10000); -}; +} void havocbot_goalrating_ctf_ourstolenflag(float ratingscale) { @@ -148,7 +148,7 @@ void havocbot_goalrating_ctf_ourstolenflag(float ratingscale) if(mf.tag_entity) navigation_routerating(mf.tag_entity, ratingscale, 10000); -}; +} void havocbot_goalrating_ctf_droppedflags(float ratingscale, vector org, float radius) { @@ -171,7 +171,7 @@ void havocbot_goalrating_ctf_droppedflags(float ratingscale, vector org, float r head = head.ctf_worldflagnext; } -}; +} void havocbot_goalrating_ctf_carrieritems(float ratingscale, vector org, float sradius) { @@ -192,7 +192,7 @@ void havocbot_goalrating_ctf_carrieritems(float ratingscale, vector org, float s } head = head.chain; } -}; +} void havocbot_role_ctf_setrole(entity bot, float role) { @@ -237,7 +237,7 @@ void havocbot_role_ctf_setrole(entity bot, float role) break; } dprint("\n"); -}; +} void havocbot_role_ctf_carrier() { @@ -275,7 +275,7 @@ void havocbot_role_ctf_carrier() return; } } -}; +} void havocbot_role_ctf_escort() { @@ -335,7 +335,7 @@ void havocbot_role_ctf_escort() havocbot_goalrating_items(10000, self.origin, 10000); navigation_goalrating_end(); } -}; +} void havocbot_role_ctf_offense() { @@ -416,7 +416,7 @@ void havocbot_role_ctf_offense() havocbot_goalrating_items(1000, self.origin, 10000); navigation_goalrating_end(); } -}; +} // Retriever (temporary role): void havocbot_role_ctf_retriever() @@ -465,7 +465,7 @@ void havocbot_role_ctf_retriever() havocbot_goalrating_items(500, self.origin, radius); navigation_goalrating_end(); } -}; +} void havocbot_role_ctf_middle() { @@ -516,7 +516,7 @@ void havocbot_role_ctf_middle() havocbot_goalrating_ctf_enemybase(2500); navigation_goalrating_end(); } -}; +} void havocbot_role_ctf_defense() { @@ -591,7 +591,7 @@ void havocbot_role_ctf_defense() havocbot_goalrating_items(5000, self.origin, 10000); navigation_goalrating_end(); } -}; +} void havocbot_calculate_middlepoint() { @@ -610,7 +610,7 @@ void havocbot_calculate_middlepoint() } havocbot_ctf_middlepoint = p1 + ((p2-p1) * 0.5); havocbot_ctf_middlepoint_radius = vlen(p2-p1) * 0.5; -}; +} void havocbot_ctf_reset_role(entity bot) { @@ -676,9 +676,9 @@ void havocbot_ctf_reset_role(entity bot) havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_OFFENSE); else havocbot_role_ctf_setrole(bot, HAVOCBOT_CTF_ROLE_MIDDLE); -}; +} void havocbot_chooserole_ctf() { havocbot_ctf_reset_role(self); -}; +} diff --git a/qcsrc/server/bot/havocbot/role_freezetag.qc b/qcsrc/server/bot/havocbot/role_freezetag.qc index 626792f2e..4e5669eb2 100644 --- a/qcsrc/server/bot/havocbot/role_freezetag.qc +++ b/qcsrc/server/bot/havocbot/role_freezetag.qc @@ -25,7 +25,7 @@ void havocbot_goalrating_freeplayers(float ratingscale, vector org, float sradiu } } } -}; +} void havocbot_role_ft_offense() { @@ -66,7 +66,7 @@ void havocbot_role_ft_offense() //havocbot_goalrating_waypoints(1, self.origin, 1000); navigation_goalrating_end(); } -}; +} void havocbot_role_ft_freeing() { @@ -95,7 +95,7 @@ void havocbot_role_ft_freeing() //havocbot_goalrating_waypoints(1, self.origin, 1000); navigation_goalrating_end(); } -}; +} void havocbot_chooserole_ft() { @@ -106,4 +106,4 @@ void havocbot_chooserole_ft() self.havocbot_role = havocbot_role_ft_freeing; else self.havocbot_role = havocbot_role_ft_offense; -}; +} diff --git a/qcsrc/server/bot/havocbot/role_keepaway.qc b/qcsrc/server/bot/havocbot/role_keepaway.qc index 15e10f683..ede6208a1 100644 --- a/qcsrc/server/bot/havocbot/role_keepaway.qc +++ b/qcsrc/server/bot/havocbot/role_keepaway.qc @@ -25,7 +25,7 @@ void havocbot_goalrating_ball(float ratingscale, vector org) // Ball has been dropped so collect. navigation_routerating(ka_ball, ratingscale, 2000); -}; +} void havocbot_role_ka_carrier() { @@ -48,7 +48,7 @@ void havocbot_role_ka_carrier() self.havocbot_role = havocbot_role_ka_collector; self.bot_strategytime = 0; } -}; +} void havocbot_role_ka_collector() { @@ -71,7 +71,7 @@ void havocbot_role_ka_collector() self.havocbot_role = havocbot_role_ka_carrier; self.bot_strategytime = 0; } -}; +} void havocbot_chooserole_ka() { @@ -79,4 +79,4 @@ void havocbot_chooserole_ka() self.havocbot_role = havocbot_role_ka_carrier; else self.havocbot_role = havocbot_role_ka_collector; -}; +} diff --git a/qcsrc/server/bot/havocbot/role_keyhunt.qc b/qcsrc/server/bot/havocbot/role_keyhunt.qc index 811d66dc5..3b641d9ce 100644 --- a/qcsrc/server/bot/havocbot/role_keyhunt.qc +++ b/qcsrc/server/bot/havocbot/role_keyhunt.qc @@ -33,7 +33,7 @@ void havocbot_goalrating_kh(float ratingscale_team, float ratingscale_dropped, f } havocbot_goalrating_items(1, self.origin, 10000); -}; +} void havocbot_role_kh_carrier() { @@ -101,7 +101,7 @@ void havocbot_role_kh_defense() navigation_goalrating_end(); } -}; +} void havocbot_role_kh_offense() { @@ -143,7 +143,7 @@ void havocbot_role_kh_offense() navigation_goalrating_end(); } -}; +} void havocbot_role_kh_freelancer() { @@ -193,7 +193,7 @@ void havocbot_role_kh_freelancer() navigation_goalrating_end(); } -}; +} void havocbot_chooserole_kh() { @@ -209,4 +209,4 @@ void havocbot_chooserole_kh() self.havocbot_role = havocbot_role_kh_defense; else self.havocbot_role = havocbot_role_kh_freelancer; -}; +} diff --git a/qcsrc/server/bot/havocbot/role_onslaught.qc b/qcsrc/server/bot/havocbot/role_onslaught.qc index 61b6e205c..3ae7379be 100644 --- a/qcsrc/server/bot/havocbot/role_onslaught.qc +++ b/qcsrc/server/bot/havocbot/role_onslaught.qc @@ -67,7 +67,7 @@ void havocbot_goalrating_ons_offenseitems(float ratingscale, vector org, float s } head = head.chain; } -}; +} void havocbot_role_ons_setrole(entity bot, float role) { @@ -94,7 +94,7 @@ void havocbot_role_ons_setrole(entity bot, float role) break; } dprint("\n"); -}; +} float havocbot_ons_teamcount(entity bot, float role) { @@ -107,7 +107,7 @@ float havocbot_ons_teamcount(entity bot, float role) ++c; return c; -}; +} void havocbot_goalrating_ons_controlpoints_attack(float ratingscale) { @@ -231,7 +231,7 @@ void havocbot_goalrating_ons_controlpoints_attack(float ratingscale) if not(found) navigation_routerating(cp, ratingscale, 10000); } -}; +} float havocbot_goalrating_ons_generator_attack(float ratingscale) { @@ -286,7 +286,7 @@ float havocbot_goalrating_ons_generator_attack(float ratingscale) } } return FALSE; -}; +} void havocbot_role_ons_offense() { @@ -321,17 +321,17 @@ void havocbot_role_ons_offense() self.bot_strategytime = time + autocvar_bot_ai_strategyinterval; } -}; +} void havocbot_role_ons_assistant() { havocbot_ons_reset_role(self); -}; +} void havocbot_role_ons_defense() { havocbot_ons_reset_role(self); -}; +} void havocbot_ons_reset_role(entity bot) { @@ -358,9 +358,9 @@ void havocbot_ons_reset_role(entity bot) } havocbot_role_ons_setrole(bot, HAVOCBOT_ONS_ROLE_OFFENSE); -}; +} void havocbot_chooserole_ons() { havocbot_ons_reset_role(self); -}; +} diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc index 4947c987e..b208e00b3 100644 --- a/qcsrc/server/bot/havocbot/roles.qc +++ b/qcsrc/server/bot/havocbot/roles.qc @@ -125,7 +125,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius) navigation_routerating(head, rating * ratingscale, 2000); head = head.chain; } -}; +} void havocbot_goalrating_controlpoints(float ratingscale, vector org, float sradius) { @@ -144,7 +144,7 @@ void havocbot_goalrating_controlpoints(float ratingscale, vector org, float srad } head = head.chain; } -}; +} void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradius) { @@ -207,7 +207,7 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi navigation_routerating(head, t * ratingscale, 2000); } } -}; +} // choose a role according to the situation void() havocbot_role_dm; @@ -229,7 +229,7 @@ void havocbot_role_dom() //havocbot_goalrating_waypoints(1, self.origin, 1000); navigation_goalrating_end(); } -}; +} //DM: //go to best items @@ -247,7 +247,7 @@ void havocbot_role_dm() //havocbot_goalrating_waypoints(1, self.origin, 1000); navigation_goalrating_end(); } -}; +} //Race: //go to next checkpoint, and annoy enemies @@ -281,22 +281,22 @@ void havocbot_role_race() navigation_goalrating_end(); } -}; +} void havocbot_chooserole_dm() { self.havocbot_role = havocbot_role_dm; -}; +} void havocbot_chooserole_race() { self.havocbot_role = havocbot_role_race; -}; +} void havocbot_chooserole_dom() { self.havocbot_role = havocbot_role_dom; -}; +} void havocbot_chooserole() { @@ -320,4 +320,4 @@ void havocbot_chooserole() havocbot_chooserole_ast(); else // assume anything else is deathmatch havocbot_chooserole_dm(); -}; +} diff --git a/qcsrc/server/bot/navigation.qc b/qcsrc/server/bot/navigation.qc index b13f183c7..6aa6ea2a1 100644 --- a/qcsrc/server/bot/navigation.qc +++ b/qcsrc/server/bot/navigation.qc @@ -204,7 +204,7 @@ float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float debugnodestatus(org, DEBUG_NODE_FAIL); return FALSE; -}; +} ///////////////////////////////////////////////////////////////////////////// // goal stack @@ -247,7 +247,7 @@ void navigation_clearroute() self.goalstack29 = world; self.goalstack30 = world; self.goalstack31 = world; -}; +} // add a new goal at the beginning of the stack // (in other words: add a new prerequisite before going to the later goals) @@ -290,7 +290,7 @@ void navigation_pushroute(entity e) self.goalstack02 = self.goalstack01; self.goalstack01 = self.goalcurrent; self.goalcurrent = e; -}; +} // remove first goal from stack // (in other words: remove a prerequisite for reaching the later goals) @@ -330,7 +330,7 @@ void navigation_poproute() self.goalstack29 = self.goalstack30; self.goalstack30 = self.goalstack31; self.goalstack31 = world; -}; +} // find the spawnfunc_waypoint near a dynamic goal such as a dropped weapon entity navigation_findnearestwaypoint(entity ent, float walkfromwp) @@ -482,7 +482,7 @@ void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vecto wp.wpfire = 1; wp.wpnearestpoint = v; } -}; +} // queries the entire spawnfunc_waypoint network for pathes leading away from the bot void navigation_markroutes(entity fixed_source_waypoint) @@ -578,7 +578,7 @@ void navigation_markroutes(entity fixed_source_waypoint) w = w.chain; } } -}; +} // queries the entire spawnfunc_waypoint network for pathes leading to the bot void navigation_markroutes_inverted(entity fixed_source_waypoint) @@ -641,7 +641,7 @@ void navigation_markroutes_inverted(entity fixed_source_waypoint) w = w.chain; } } -}; +} // updates the best goal according to a weighted calculation of travel cost and item value of a new proposed item void navigation_routerating(entity e, float f, float rangebias) @@ -825,7 +825,7 @@ void navigation_routerating(entity e, float f, float rangebias) } } //dprint("\n"); -}; +} // adds an item to the the goal stack with the path to a given item float navigation_routetogoal(entity e, vector startposition) @@ -870,7 +870,7 @@ float navigation_routetogoal(entity e, vector startposition) } return FALSE; -}; +} // removes any currently touching waypoints from the goal stack // (this is how bots detect if they reached a goal) @@ -971,7 +971,7 @@ void navigation_goalrating_start() navigation_clearroute(); navigation_bestgoal = world; navigation_markroutes(world); -}; +} // ends a goal selection session (updates goal stack to the best goal) void navigation_goalrating_end() @@ -994,7 +994,7 @@ void navigation_goalrating_end() self.navigation_hasgoals = FALSE; // Reset this value } -}; +} void botframe_updatedangerousobjects(float maxupdate) { @@ -1032,7 +1032,7 @@ void botframe_updatedangerousobjects(float maxupdate) break; botframe_dangerwaypoint = find(botframe_dangerwaypoint, classname, "waypoint"); } -}; +} void navigation_unstuck() { diff --git a/qcsrc/server/bot/waypoints.qc b/qcsrc/server/bot/waypoints.qc index 84049a970..e2bcc5bd6 100644 --- a/qcsrc/server/bot/waypoints.qc +++ b/qcsrc/server/bot/waypoints.qc @@ -67,7 +67,7 @@ entity waypoint_spawn(vector m1, vector m2, float f) w.model = ""; return w; -}; +} // add a new link to the spawnfunc_waypoint, replacing the furthest link it already has void waypoint_addlink(entity from, entity to) @@ -144,7 +144,7 @@ void waypoint_addlink(entity from, entity to) if (from.wp01mincost < c) {from.wp02 = to;from.wp02mincost = c;return;} from.wp02 = from.wp01;from.wp02mincost = from.wp01mincost; if (from.wp00mincost < c) {from.wp01 = to;from.wp01mincost = c;return;} from.wp01 = from.wp00;from.wp01mincost = from.wp00mincost; from.wp00 = to;from.wp00mincost = c;return; -}; +} // relink this spawnfunc_waypoint // (precompile a list of all reachable waypoints from this spawnfunc_waypoint) @@ -226,7 +226,7 @@ void waypoint_think() } navigation_testtracewalk = 0; self.wplinked = TRUE; -}; +} void waypoint_clearlinks(entity wp) { @@ -244,7 +244,7 @@ void waypoint_clearlinks(entity wp) wp.wp24mincost = wp.wp25mincost = wp.wp26mincost = wp.wp27mincost = wp.wp28mincost = wp.wp29mincost = wp.wp30mincost = wp.wp31mincost = f; wp.wplinked = FALSE; -}; +} // tell a spawnfunc_waypoint to relink void waypoint_schedulerelink(entity wp) @@ -287,7 +287,7 @@ void spawnfunc_waypoint() // schedule a relink after other waypoints have had a chance to spawn waypoint_clearlinks(self); //waypoint_schedulerelink(self); -}; +} // remove a spawnfunc_waypoint, and schedule all neighbors to relink void waypoint_remove(entity e) @@ -327,7 +327,7 @@ void waypoint_remove(entity e) waypoint_schedulerelink(e.wp31); // and now remove the spawnfunc_waypoint remove(e); -}; +} // empties the map of waypoints void waypoint_removeall() @@ -340,7 +340,7 @@ void waypoint_removeall() remove(head); head = next; } -}; +} // tell all waypoints to relink // (is this useful at all?) @@ -354,7 +354,7 @@ void waypoint_schedulerelinkall() waypoint_schedulerelink(head); head = head.chain; } -}; +} // Load waypoint links from file float waypoint_load_links() @@ -451,7 +451,7 @@ float waypoint_load_links() botframe_cachedwaypointlinks = TRUE; return TRUE; -}; +} void waypoint_load_links_hardwired() { @@ -549,7 +549,7 @@ void waypoint_load_links_hardwired() dprint(" waypoint links from maps/"); dprint(mapname); dprint(".waypoints.hardwired\n"); -}; +} // Save all waypoint links to a file void waypoint_save_links() @@ -627,7 +627,7 @@ void waypoint_save_links() print(" waypoints links to maps/"); print(mapname); print(".waypoints.cache\n"); -}; +} // save waypoints to gamedir/data/maps/mapname.waypoints void waypoint_saveall() @@ -671,7 +671,7 @@ void waypoint_saveall() } waypoint_save_links(); botframe_loadedforcedlinks = FALSE; -}; +} // load waypoints from file float waypoint_loadall() @@ -722,7 +722,7 @@ float waypoint_loadall() dprint(" failed\n"); } return cwp + cwb; -}; +} vector waypoint_fixorigin(vector position) { @@ -772,7 +772,7 @@ void waypoint_spawnforitem(entity e) return; waypoint_spawnforitem_force(e, e.origin); -}; +} void waypoint_spawnforteleporter_boxes(entity e, vector org1, vector org2, vector destination1, vector destination2, float timetaken) { @@ -787,20 +787,20 @@ void waypoint_spawnforteleporter_boxes(entity e, vector org1, vector org2, vecto // (teleporters are not goals, so this is probably useless) e.nearestwaypoint = w; e.nearestwaypointtimeout = time + 1000000000; -}; +} void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { org = waypoint_fixorigin(org); destination = waypoint_fixorigin(destination); waypoint_spawnforteleporter_boxes(e, org, org, destination, destination, timetaken); -}; +} void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { destination = waypoint_fixorigin(destination); waypoint_spawnforteleporter_boxes(e, e.absmin, e.absmax, destination, destination, timetaken); -}; +} entity waypoint_spawnpersonal(vector position) { @@ -819,7 +819,7 @@ entity waypoint_spawnpersonal(vector position) waypoint_schedulerelink(w); return w; -}; +} void botframe_showwaypointlinks() { @@ -876,4 +876,4 @@ void botframe_showwaypointlinks() } player = find(player, classname, "player"); } -}; +} diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 451ab3990..f477f77e4 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -118,7 +118,7 @@ void spawnpoint_use() self.team = activator.team; some_spawn_has_been_used = 1; } -}; +} // Returns: // _x: prio (-1 if unusable) @@ -1910,7 +1910,7 @@ void ChatBubbleThink() self.model = self.mdl; else self.model = ""; -}; +} void UpdateChatBubble() { @@ -1949,7 +1949,7 @@ void UpdateChatBubble() else if (c == 12) self.colormod = '1.22 1.22 0.10'; else if (c == 13) self.colormod = '0.10 0.10 1.73'; else self.colormod = '1 1 1'; -};*/ +}*/ .float oldcolormap; void respawn(void) diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index 79154ed76..b675c56e9 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -207,7 +207,7 @@ void CheckWaterJump() return; } } -}; +} void CheckPlayerJump() { if(self.flags & FL_ONGROUND) @@ -1341,4 +1341,4 @@ void SV_PlayerPhysics() self.lastflags = self.flags; self.lastclassname = self.classname; -}; +} diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 298948ffa..13cf1ad68 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -230,7 +230,7 @@ void player_setupanimsformodel() // TODO introspect models for finding right "fps" value (1/duration) // reset animstate now setanim(self, self.anim_idle, TRUE, FALSE, TRUE); -}; +} void player_anim (void) { diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc index b78859295..edf5b1f5e 100644 --- a/qcsrc/server/cl_weapons.qc +++ b/qcsrc/server/cl_weapons.qc @@ -17,7 +17,7 @@ void W_SwitchWeapon(float imp) { W_TriggerReload(); } -}; +} .float weaponcomplainindex; float W_GetCycleWeapon(entity pl, string weaponorder, float dir, float imp, float complain, float skipmissing) @@ -149,14 +149,14 @@ void W_LastWeapon() float w_getbestweapon(entity e) { return W_GetCycleWeapon(e, e.cvar_cl_weaponpriority, 0, -1, FALSE, TRUE); -}; +} // generic weapons table // TODO should they be macros instead? float weapon_action(float wpn, float wrequest) { return (get_weaponinfo(wpn)).weapon_func(wrequest); -}; +} string W_Name(float weaponid) { @@ -317,7 +317,7 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce) sprint(self, strcat("You dropped the ^2", W_Name(w), "\n")); else sprint(self, strcat("You dropped the ^2", W_Name(w), " with ", a, "\n")); -}; +} // Bringed back weapon frame void W_WeaponFrame() @@ -469,4 +469,4 @@ void W_WeaponFrame() else self.currentammo = 1; #endif -}; +} diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index b426dbb56..4acb8da89 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -261,7 +261,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m // nudge w_shotend so a trace to w_shotend hits w_shotend = w_shotend + normalize(w_shotend - w_shotorg) * nudge; -}; +} #define W_SetupShot_Dir_ProjectileSize(ent,s_forward,mi,ma,antilag,recoil,snd,chan,maxdamage) W_SetupShot_Dir_ProjectileSize_Range(ent, s_forward, mi, ma, antilag, recoil, snd, chan, maxdamage, MAX_SHOT_DISTANCE) #define W_SetupShot_ProjectileSize(ent,mi,ma,antilag,recoil,snd,chan,maxdamage) W_SetupShot_Dir_ProjectileSize(ent, v_forward, mi, ma, antilag, recoil, snd, chan, maxdamage) @@ -575,7 +575,7 @@ void CL_Weaponentity_Think() f = 1; self.angles_x = -90 * f * f; } -}; +} void CL_ExteriorWeaponentity_Think() { @@ -681,7 +681,7 @@ void CL_ExteriorWeaponentity_Think() self.glowmod = self.owner.weaponentity_glowmod; self.colormap = self.owner.colormap; -}; +} // spawning weaponentity for client void CL_SpawnWeaponentity() @@ -708,7 +708,7 @@ void CL_SpawnWeaponentity() self.exteriorweaponentity.angles = '0 0 0'; self.exteriorweaponentity.think = CL_ExteriorWeaponentity_Think; self.exteriorweaponentity.nextthink = time; -}; +} void Send_WeaponComplain (entity e, float wpn, string wpnname, float type) { @@ -820,7 +820,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) play2(cl, "weapons/unavailable.wav"); } return FALSE; -}; +} // Weapon subs void w_clear() @@ -835,14 +835,14 @@ void w_clear() self.weaponentity.state = WS_CLEAR; self.weaponentity.effects = 0; } -}; +} void w_ready() { if (self.weaponentity) self.weaponentity.state = WS_READY; weapon_thinkf(WFRAME_IDLE, 1000000, w_ready); -}; +} // Setup weapon for client (after this raise frame will be launched) void weapon_setup(float windex) @@ -857,7 +857,7 @@ void weapon_setup(float windex) self.switchingweapon = windex; // to make sure self.weaponname = e.mdl; self.bulletcounter = 0; -}; +} // perform weapon to attack (weaponstate and attack_finished check is here) void W_SwitchToOtherWeapon(entity pl) @@ -1037,12 +1037,12 @@ void weapon_thinkf(float fr, float t, void() func) setanim(self, anim, FALSE, TRUE, TRUE); } } -}; +} void weapon_boblayer1(float spd, vector org) { // VorteX: haste can be added here -}; +} vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity, float forceAbsolute) { diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index 3d2325ddc..cf0850d36 100644 --- a/qcsrc/server/ctf.qc +++ b/qcsrc/server/ctf.qc @@ -193,7 +193,7 @@ void place_flag() } InitializeEntity(self, ctf_flag_spawnstuff, INITPRIO_SETLOCATION); -}; +} void LogCTF(string mode, float flagteam, entity actor) { @@ -232,7 +232,7 @@ void RegenFlag(entity e) e.cnt = FLAG_BASE; e.owner = world; e.flags = FL_ITEM | FL_NOTARGET; // clear FL_ONGROUND and any other junk -}; +} void ReturnFlag(entity e) { @@ -253,7 +253,7 @@ void ReturnFlag(entity e) } e.owner = world; RegenFlag(e); -}; +} void DropFlag(entity e, entity penalty_receiver, entity attacker) { @@ -329,7 +329,7 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker) tracebox(e.origin, e.mins, e.maxs, e.origin, TRUE, e); if(trace_startsolid) dprint("FLAG FALLTHROUGH will happen SOON\n"); -}; +} void FlagThink() { @@ -402,7 +402,7 @@ void FlagThink() DropFlag(self, world, world); return; } -}; +} float ctf_usekey() { @@ -417,7 +417,7 @@ float ctf_usekey() void flag_cap_ring_spawn(vector org) { shockwave_spawn("models/ctf/shockwavetransring.md3", org - '0 0 15', -0.8, 0, 1); -}; +} void FlagTouch() { @@ -635,7 +635,7 @@ void FlagTouch() WaypointSprite_AttachCarrier("flagcarrier", other, RADARICON_FLAGCARRIER, '1 1 0'); } } -}; +} /*QUAKED spawnfunc_info_player_team1 (1 0 0) (-16 -16 -24) (16 16 24) CTF Starting point for a player @@ -654,8 +654,8 @@ void spawnfunc_info_player_team1() } self.team = COLOR_TEAM1; // red spawnfunc_info_player_deathmatch(); -}; -//self.team = 4;self.classname = "info_player_start";spawnfunc_info_player_start();}; +} +//self.team = 4;self.classname = "info_player_start";spawnfunc_info_player_start();} /*QUAKED spawnfunc_info_player_team2 (1 0 0) (-16 -16 -24) (16 16 24) CTF Starting point for a player in @@ -674,8 +674,8 @@ void spawnfunc_info_player_team2() } self.team = COLOR_TEAM2; // blue spawnfunc_info_player_deathmatch(); -}; -//self.team = 13;self.classname = "info_player_start";spawnfunc_info_player_start();}; +} +//self.team = 13;self.classname = "info_player_start";spawnfunc_info_player_start();} /*QUAKED spawnfunc_info_player_team3 (1 0 0) (-16 -16 -24) (16 16 24) CTF Starting point for a player in @@ -694,7 +694,7 @@ void spawnfunc_info_player_team3() } self.team = COLOR_TEAM3; // yellow spawnfunc_info_player_deathmatch(); -}; +} /*QUAKED spawnfunc_info_player_team4 (1 0 0) (-16 -16 -24) (16 16 24) @@ -714,7 +714,7 @@ void spawnfunc_info_player_team4() } self.team = COLOR_TEAM4; // purple spawnfunc_info_player_deathmatch(); -}; +} void item_flag_reset() { @@ -741,7 +741,7 @@ void item_flag_postspawn() self.glow_size = 25; self.glow_trail = 1; } -}; +} /*QUAKED spawnfunc_item_flag_team1 (0 0.5 0.8) (-48 -48 -37) (48 48 37) CTF flag for team one (Red). @@ -841,7 +841,7 @@ void spawnfunc_item_flag_team1() precache_model("models/ctf/shockwavetransring.md3"); self.reset = item_flag_reset; -}; +} /*QUAKED spawnfunc_item_flag_team2 (0 0.5 0.8) (-48 -48 -24) (48 48 64) CTF flag for team two (Blue). @@ -940,7 +940,7 @@ void spawnfunc_item_flag_team2() precache_model("models/ctf/shockwavetransring.md3"); self.reset = item_flag_reset; -}; +} /*QUAKED spawnfunc_ctf_team (0 .5 .8) (-16 -16 -24) (16 16 32) @@ -967,7 +967,7 @@ void spawnfunc_ctf_team() } self.classname = "ctf_team"; self.team = self.cnt + 1; -}; +} // code from here on is just to support maps that don't have control point and team entities void ctf_spawnteam (string teamname, float teamcolor) @@ -982,7 +982,7 @@ void ctf_spawnteam (string teamname, float teamcolor) spawnfunc_ctf_team(); self = oldself; -}; +} // spawn some default teams if the map is not set up for ctf void ctf_spawnteams() @@ -993,7 +993,7 @@ void ctf_spawnteams() ctf_spawnteam("Red", COLOR_TEAM1 - 1); ctf_spawnteam("Blue", COLOR_TEAM2 - 1); -}; +} void ctf_delayedinit() { @@ -1002,7 +1002,7 @@ void ctf_delayedinit() ctf_spawnteams(); ScoreRules_ctf(); -}; +} void ctf_init() { @@ -1017,7 +1017,7 @@ void ctf_init() //#NO AUTOCVARS START g_ctf_win_mode = cvar("g_ctf_win_mode"); //#NO AUTOCVARS END -}; +} void ctf_setstatus2(entity flag, float shift) { @@ -1032,7 +1032,7 @@ void ctf_setstatus2(entity flag, float shift) { // no status bits } -}; +} void ctf_setstatus() { @@ -1078,7 +1078,7 @@ void ctf_setstatus() ctf_setstatus2(flag, IT_BLUE_FLAG_TAKEN); } } -}; +} /* entity(float cteam) ctf_team_has_commander = { @@ -1092,13 +1092,13 @@ entity(float cteam) ctf_team_has_commander = } } return world; -}; +} void(entity e, float st) ctf_setstate = { e.ctf_state = st; ++e.version; -}; +} void(float cteam) ctf_new_commander = { @@ -1123,7 +1123,7 @@ void(float cteam) ctf_new_commander = ctf_setstate(plmax, 3); sprint(plmax, "^3You're the commander now!\n"); centerprint(plmax, "^3You're the commander now!\n"); -}; +} void() ctf_clientconnect = { @@ -1139,7 +1139,7 @@ void() ctf_clientconnect = if(self.team != 0 && self.classname == "player" && !ctf_team_has_commander(self.team)) { ctf_new_commander(self.team); } -}; +} void() ctf_playerchanged = { @@ -1164,7 +1164,7 @@ void() ctf_playerchanged = self.team_saved = self.team; ctf_new_commander(self.team); -}; +} void() ctf_clientdisconnect = { @@ -1172,7 +1172,7 @@ void() ctf_clientdisconnect = { ctf_new_commander(self.team); } -}; +} entity GetPlayer(string); float() ctf_clientcommand = @@ -1216,5 +1216,5 @@ float() ctf_clientcommand = return TRUE; } return FALSE; -}; +} */ diff --git a/qcsrc/server/domination.qc b/qcsrc/server/domination.qc index 39a6c35a8..9e56023cb 100644 --- a/qcsrc/server/domination.qc +++ b/qcsrc/server/domination.qc @@ -179,7 +179,7 @@ void dompoint_captured () FOR_EACH_REALCLIENT(head) set_dom_state(head); -}; +} void AnimateDomPoint() { @@ -287,7 +287,7 @@ void dompointtouch() self.enemy = other; // individual player scoring self.enemy_playerid = other.playerid; dompoint_captured(); -}; +} /*QUAKED spawnfunc_dom_team (0 .5 .8) (-32 -32 -24) (32 32 32) Team declaration for Domination gameplay, this allows you to decide what team @@ -336,7 +336,7 @@ void spawnfunc_dom_team() // this would have to be changed if used in quakeworld if(self.cnt) self.team = self.cnt + 1; // WHY are these different anyway? -}; +} void dom_controlpoint_setup() { @@ -391,7 +391,7 @@ void dom_controlpoint_setup() waypoint_spawnforitem(self); WaypointSprite_SpawnFixed("dom-neut", self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT, '0 1 1'); -}; +} @@ -607,7 +607,7 @@ void spawnfunc_dom_controlpoint() self.effects = self.effects | EF_LOWPRECISION; if (autocvar_g_domination_point_fullbright) self.effects |= EF_FULLBRIGHT; -}; +} // code from here on is just to support maps that don't have control point and team entities void dom_spawnteam (string teamname, float teamcolor, string pointmodel, float pointskin, string capsound, string capnarration, string capmessage) @@ -635,7 +635,7 @@ void dom_spawnteam (string teamname, float teamcolor, string pointmodel, float p //eprint(self); self = oldself; -}; +} void dom_spawnpoint(vector org) { @@ -648,7 +648,7 @@ void dom_spawnpoint(vector org) setorigin(self, org); spawnfunc_dom_controlpoint(); self = oldself; -}; +} // spawn some default teams if the map is not set up for domination void dom_spawnteams() @@ -666,7 +666,7 @@ void dom_spawnteams() if(numteams > 3) dom_spawnteam("Pink", COLOR_TEAM4-1, "models/domination/dom_pink.md3", 0, "domination/claim.wav", "", "Pink team has captured a control point"); dom_spawnteam("", 0, "models/domination/dom_unclaimed.md3", 0, "", "", ""); -}; +} void dom_delayedinit() { @@ -691,7 +691,7 @@ void dom_delayedinit() } ScoreRules_dom(); -}; +} void dom_init() { @@ -711,5 +711,5 @@ void dom_init() addstat(STAT_DOM_PPS_BLUE, AS_FLOAT, dom_pps_blue); if(c3 >= 0) addstat(STAT_DOM_PPS_YELLOW, AS_FLOAT, dom_pps_yellow); if(c4 >= 0) addstat(STAT_DOM_PPS_PINK, AS_FLOAT, dom_pps_pink); -}; +} diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc index 660604332..af9a73eca 100644 --- a/qcsrc/server/ent_cs.qc +++ b/qcsrc/server/ent_cs.qc @@ -18,7 +18,7 @@ void entcs_init() { print("Initializing ClientSide information entities\n"); -}; +} float entcs_customize() { @@ -56,7 +56,7 @@ float entcs_send(entity to, float sf) if(sf & 16) WriteByte(MSG_ENTITY, self.armorvalue / 10); // FIXME use a better scale? return TRUE; -}; +} void entcs_think() { @@ -85,7 +85,7 @@ void entcs_think() self.armorvalue = o.armorvalue; self.SendFlags |= 16; } -}; +} entity attach_entcs() { @@ -103,10 +103,10 @@ entity attach_entcs() self.entcs = ent; return ent; -}; +} void detach_entcs() { remove(self.entcs); self.entcs = world; -}; +} diff --git a/qcsrc/server/extensions.qh b/qcsrc/server/extensions.qh index 8aefd1674..c514de568 100644 --- a/qcsrc/server/extensions.qh +++ b/qcsrc/server/extensions.qh @@ -1463,9 +1463,9 @@ float(entity clent) clienttype = #455; // returns one of the CLIENTTYPE_* consta //it is a good idea to return FALSE early in the function if possible to reduce cpu usage, because this function may be called many thousands of times per frame if there are many customized entities on a 64+ player server. //you are free to change anything in self, but please do not change any other entities (the results may be very inconsistent). //example ideas for use of this extension: -//making icons over teammates' heads which are only visible to teammates. for exasmple: float() playericon_customizeentityforclient = {return self.owner.team == other.team;}; -//making cloaked players more visible to their teammates than their enemies. for example: float() player_customizeentityforclient = {if (self.items & IT_CLOAKING) {if (self.team == other.team) self.alpha = 0.6;else self.alpha = 0.1;} return TRUE;}; -//making explosion models that face the viewer (does not work well with chase_active). for example: float() explosion_customizeentityforclient = {self.angles = vectoangles(other.origin + other.view_ofs - self.origin);self.angles_x = 0 - self.angles_x;}; +//making icons over teammates' heads which are only visible to teammates. for exasmple: float() playericon_customizeentityforclient = {return self.owner.team == other.team;} +//making cloaked players more visible to their teammates than their enemies. for example: float() player_customizeentityforclient = {if (self.items & IT_CLOAKING) {if (self.team == other.team) self.alpha = 0.6;else self.alpha = 0.1;} return TRUE;} +//making explosion models that face the viewer (does not work well with chase_active). for example: float() explosion_customizeentityforclient = {self.angles = vectoangles(other.origin + other.view_ofs - self.origin);self.angles_x = 0 - self.angles_x;} //implementation notes: //entity customization is done before per-client culling (visibility for instance) because the entity may be doing setorigin to display itself in different locations on different clients, may be altering its .modelindex, .effects and other fields important to culling, so customized entities increase cpu usage (non-customized entities can use all the early culling they want however, as they are not changing on a per client basis). @@ -2158,12 +2158,12 @@ float(float skel, float bonenum, string g1, string g2, string g3, string g4, str bonenum = skel_get_boneparent(skel, bonenum); } return 0; -}; +} // create a skeletonindex for our player using current modelindex void() example_skel_player_setup = { self.skeletonindex = skel_create(self.modelindex); -}; +} // setup bones of skeleton based on an animation // note: animmodelindex can be a different model than self.modelindex void(float animmodelindex, float framegroup, float framegroupstarttime) example_skel_player_update_begin = @@ -2181,7 +2181,7 @@ void(float animmodelindex, float framegroup, float framegroupstarttime) example_ self.lerpfrac3 = 0; self.lerpfrac4 = 0; skel_build(self.skeletonindex, self, animmodelindex, 0, 0, 100000); -}; +} // apply a different framegroup animation to bones with a specified parent void(float animmodelindex, float framegroup, float framegroupstarttime, float blendalpha, string groupbonename, string excludegroupname1, string excludegroupname2) example_skel_player_update_applyoverride = { @@ -2206,7 +2206,7 @@ void(float animmodelindex, float framegroup, float framegroupstarttime, float bl skel_build(self.skeletonindex, self, animmodelindex, 1 - blendalpha, bonenum, bonenum + 1); bonenum = bonenum + 1; } -}; +} // make eyes point at a target location, be sure v_forward, v_right, v_up are set correctly before calling void(vector eyetarget, string bonename) example_skel_player_update_eyetarget = { @@ -2257,14 +2257,14 @@ void(vector eyetarget, string bonename) example_skel_player_update_eyetarget = v_forward = oldforward; v_right = oldright; v_up = oldup; -}; +} // delete skeleton when we're done with it // note: skeleton remains valid until next frame when it is really deleted void() example_skel_player_delete = { skel_delete(self.skeletonindex); self.skeletonindex = 0; -}; +} // // END OF EXAMPLES FOR FTE_CSQC_SKELETONOBJECTS // diff --git a/qcsrc/server/func_breakable.qc b/qcsrc/server/func_breakable.qc index 46cde588d..a667101d2 100644 --- a/qcsrc/server/func_breakable.qc +++ b/qcsrc/server/func_breakable.qc @@ -65,7 +65,7 @@ void LaunchDebris (string debrisname, vector force) = if(dbr.damageforcescale) dbr.takedamage = DAMAGE_YES; SUB_SetFade(dbr, time + self.debristime + crandom() * self.debristimejitter, self.debrisfadetime); -}; +} void func_breakable_colormod() { diff --git a/qcsrc/server/g_lights.qc b/qcsrc/server/g_lights.qc index a8dc1f99b..b5f4bcf84 100644 --- a/qcsrc/server/g_lights.qc +++ b/qcsrc/server/g_lights.qc @@ -34,7 +34,7 @@ void dynlight_think() remove(self); self.nextthink = time + 0.1; -}; +} void dynlight_find_aiment() { entity targ; @@ -50,7 +50,7 @@ void dynlight_find_aiment() self.v_angle = self.angles - targ.angles; self.think = dynlight_think; self.nextthink = time + 0.1; -}; +} void dynlight_find_path() { entity targ; @@ -62,7 +62,7 @@ void dynlight_find_path() setorigin (self, targ.origin); self.think = train_next; self.nextthink = time + 0.1; -}; +} void dynlight_find_target() { entity targ; @@ -81,7 +81,7 @@ void dynlight_use() self.light_lev = self.lefty; else self.light_lev = 0; -}; +} void spawnfunc_dynlight() { local entity targ; @@ -125,4 +125,4 @@ void spawnfunc_dynlight() InitializeEntity(self, dynlight_find_path, INITPRIO_FINDTARGET); return; } -}; +} diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc index 0649c89a1..e9f9b3454 100644 --- a/qcsrc/server/g_subs.qc +++ b/qcsrc/server/g_subs.qc @@ -1,4 +1,4 @@ -void SUB_Null() {}; +void SUB_Null() {} float SUB_True() { return 1; } float SUB_False() { return 0; } @@ -41,7 +41,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart e.animstate_override = override; e.frame = e.animstate_startframe; e.frame1time = servertime; -}; +} void updateanim(entity e) { @@ -56,7 +56,7 @@ void updateanim(entity e) } e.frame = e.animstate_startframe + bound(0, (time - e.animstate_starttime) * e.animstate_framerate, e.animstate_numframes - 1); //print(ftos(time), " -> ", ftos(e.frame), "\n"); -}; +} vector animfixfps(entity e, vector a) { @@ -825,7 +825,7 @@ void SetMovedir() } self.angles = '0 0 0'; -}; +} void InitTrigger() { @@ -837,7 +837,7 @@ void InitTrigger() self.movetype = MOVETYPE_NONE; self.modelindex = 0; self.model = ""; -}; +} void InitSolidBSPTrigger() { @@ -849,7 +849,7 @@ void InitSolidBSPTrigger() self.movetype = MOVETYPE_NONE; // why was this PUSH? -div0 // self.modelindex = 0; self.model = ""; -}; +} float InitMovingBrushTrigger() { @@ -864,4 +864,4 @@ float InitMovingBrushTrigger() return 0; } return 1; -}; +} diff --git a/qcsrc/server/g_tetris.qc b/qcsrc/server/g_tetris.qc index c07ef8806..d194c9431 100644 --- a/qcsrc/server/g_tetris.qc +++ b/qcsrc/server/g_tetris.qc @@ -56,7 +56,7 @@ float SVC_CENTERPRINTa = 26; float Tetris_Level() { return ((floor((self.tet_lines / 10)) + 1)); -}; +} void tetsnd(string snd) { @@ -75,7 +75,7 @@ void SetLine(float ln, string vl) if(ln < 1 || ln > TET_LINES) error("WTF"); bufstr_set(tet_line_buf, ln + TET_LINES * num_for_edict(self), vl); -}; +} string GetLine(float ln) { @@ -84,14 +84,14 @@ string GetLine(float ln) if(ln < 1 || ln > TET_LINES) return TET_EMPTY_LINE; return bufstr_get(tet_line_buf, ln + TET_LINES * num_for_edict(self)); -}; +} float GetXBlock(float x, string dat) { if(x < 1 || x > TET_WIDTH) error("WTF"); return stof(substring(dat, x-1, 1)); -}; +} string SetXBlock(float x, string dat, float new) { @@ -100,13 +100,13 @@ string SetXBlock(float x, string dat, float new) ftos(new), substring(dat, x, -1) ); -}; +} float GetSquare(float x, float y) { return GetXBlock(x, GetLine(y)); -}; +} void SetSquare(float x, float y, float val) { @@ -114,7 +114,7 @@ void SetSquare(float x, float y, float val) dat = GetLine(y); dat = SetXBlock(x, dat, val); SetLine(y, dat); -}; +} float PieceColor(float pc) { @@ -235,7 +235,7 @@ float PieceMetric(float x, float y, float rot, float pc) return !!(ce_y & pow(4, x-1)); // second row else return 0; // illegal parms -}; +} vector tet_piecemins; vector tet_piecemaxs; void PieceMinsMaxs(float rot, float pc) @@ -361,7 +361,7 @@ float pnum(float num, float dig) } WriteChar(MSG_ONE, 176 + num); return dig; -}; +} void DrawLine(float ln) { @@ -523,7 +523,7 @@ void ResetTetris() self.piece_type = 0; self.next_piece = self.tet_lines = self.tet_score = 0; self.tet_piece_bucket = 0; -}; +} void Tet_GameExit() { @@ -532,7 +532,7 @@ void Tet_GameExit() self.tet_vs_id = 0; ResetTetris(); self.movetype = MOVETYPE_WALK; -}; +} void PrintField() { @@ -800,14 +800,14 @@ float RandomPiece() self.tet_piece_bucket = b; return p + 1; } -}; +} void TetAddScore(float n) { self.tet_score = self.tet_score + n * Tetris_Level(); if (self.tet_score > tet_high_score) tet_high_score = self.tet_score; -}; +} float CheckMetrics(float piece, float orgx, float orgy, float rot) /*FIXDECL*/ { // check to see if the piece, if moved to the locations will overlap @@ -954,7 +954,7 @@ void CompletedLines() tetsnd("tetline"); else tetsnd("tetland"); -}; +} void HandleGame(float keyss) { @@ -1087,7 +1087,7 @@ void HandleGame(float keyss) return; } CementPiece(self.piece_type, self.piece_pos_x, self.piece_pos_y, self.piece_pos_z); -}; +} /* ********************************* @@ -1127,7 +1127,7 @@ void TetrisImpulse() Tet_GameExit(); self.impulse = 0; } -}; +} float TetrisPreFrame() @@ -1144,11 +1144,11 @@ float TetrisPreFrame() else self.tet_drawtime = time + 0.5; return 1; -}; +} float frik_anglemoda(float v) { return v - floor(v/360) * 360; -}; +} float angcompa(float y1, float y2) { y1 = frik_anglemoda(y1); @@ -1161,7 +1161,7 @@ float angcompa(float y1, float y2) else if (answer < -180) answer = answer + 360; return answer; -}; +} .float tetkey_down, tetkey_rotright, tetkey_left, tetkey_right, tetkey_rotleft, tetkey_drop; @@ -1240,7 +1240,7 @@ float TetrisPostFrame() } return 1; -}; +} #else diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc index 321b5b2c7..0ab2b4233 100644 --- a/qcsrc/server/g_triggers.qc +++ b/qcsrc/server/g_triggers.qc @@ -10,7 +10,7 @@ void DelayThink() activator = self.enemy; SUB_UseTargets (); remove(self); -}; +} /* ============================== @@ -132,7 +132,7 @@ void SUB_UseTargets() activator = act; self = stemp; other = otemp; -}; +} //============================================================================= @@ -149,7 +149,7 @@ void multi_wait() self.takedamage = DAMAGE_YES; self.solid = SOLID_BBOX; } -}; +} // the trigger was just touched/killed/used @@ -194,14 +194,14 @@ void multi_trigger() // called wheil C code is looping through area links... self.touch = SUB_Null; } -}; +} void multi_use() { self.goalentity = other; self.enemy = activator; multi_trigger(); -}; +} void multi_touch() { @@ -226,7 +226,7 @@ void multi_touch() self.enemy = other; self.goalentity = other; multi_trigger (); -}; +} void multi_eventdamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { @@ -318,7 +318,7 @@ void spawnfunc_trigger_multiple() setorigin (self, self.origin); // make sure it links into the world } } -}; +} /*QUAKED spawnfunc_trigger_once (.5 .5 .5) ? notouch @@ -338,7 +338,7 @@ void spawnfunc_trigger_once() { self.wait = -1; spawnfunc_trigger_multiple(); -}; +} //============================================================================= @@ -349,7 +349,7 @@ void spawnfunc_trigger_relay() { self.use = SUB_UseTargets; self.reset = spawnfunc_trigger_relay; // this spawnfunc resets fully -}; +} void delay_use() { @@ -402,7 +402,7 @@ void counter_use() centerprint(activator, "Sequence completed!"); self.enemy = activator; multi_trigger (); -}; +} void counter_reset() { @@ -426,7 +426,7 @@ void spawnfunc_trigger_counter() self.use = counter_use; self.reset = counter_reset; -}; +} void trigger_hurt_use() { @@ -484,7 +484,7 @@ void trigger_hurt_touch() } return; -}; +} /*QUAKED spawnfunc_trigger_hurt (.5 .5 .5) ? Any object touching this will be hurt @@ -514,7 +514,7 @@ void spawnfunc_trigger_hurt() if(trigger_hurt_last) trigger_hurt_last.trigger_hurt_next = self; trigger_hurt_last = self; -}; +} float tracebox_hits_trigger_hurt(vector start, vector mi, vector ma, vector end) { @@ -558,7 +558,7 @@ void trigger_heal_touch() } } } -}; +} void spawnfunc_trigger_heal() { @@ -573,7 +573,7 @@ void spawnfunc_trigger_heal() if(self.noise == "") self.noise = "misc/mediumhealth.wav"; precache_sound(self.noise); -}; +} ////////////////////////////////////////////////////////////// @@ -615,12 +615,12 @@ void trigger_gravity_check_think() self.count -= 1; self.nextthink = time; } -}; +} void trigger_gravity_use() { self.state = !self.state; -}; +} void trigger_gravity_touch() { @@ -668,7 +668,7 @@ void trigger_gravity_touch() sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); UpdateCSQCProjectile(self.owner); } -}; +} void spawnfunc_trigger_gravity() { @@ -687,7 +687,7 @@ void spawnfunc_trigger_gravity() if(self.spawnflags & 2) self.state = FALSE; } -}; +} //============================================================================= @@ -822,7 +822,7 @@ void spawnfunc_target_speaker() ambientsound (self.origin, self.noise, VOL_BASE * self.volume, self.atten); remove(self); } -}; +} void spawnfunc_func_stardust() { @@ -1025,7 +1025,7 @@ float rainsnow_SendEntity(entity to, float sf) WriteShort(MSG_ENTITY, self.count); WriteByte(MSG_ENTITY, self.cnt); return 1; -}; +} /*QUAKED spawnfunc_func_rain (0 .5 .8) ? This is an invisible area like a trigger, which rain falls inside of. @@ -1062,7 +1062,7 @@ void spawnfunc_func_rain() self.Version = 1; Net_LinkEntity(self, FALSE, 0, rainsnow_SendEntity); -}; +} /*QUAKED spawnfunc_func_snow (0 .5 .8) ? @@ -1100,7 +1100,7 @@ void spawnfunc_func_snow() self.Version = 1; Net_LinkEntity(self, FALSE, 0, rainsnow_SendEntity); -}; +} void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, float deathtype); @@ -2118,9 +2118,9 @@ void spawnfunc_target_changelevel_use() localcmd("endmatch\n"); else localcmd(strcat("changelevel ", self.chmap, "\n")); -}; +} void spawnfunc_target_changelevel() { self.use = spawnfunc_target_changelevel_use; -}; +} diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 00d96cbd3..885d146dc 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1098,7 +1098,7 @@ void GameResetCfg() { // settings persist, except... localcmd("\nsettemp_restore\n"); -}; +} void Map_Goto() { @@ -1237,7 +1237,7 @@ string GetNextMap() } return ""; -}; +} float DoNextMapOverride() { @@ -1288,7 +1288,7 @@ float DoNextMapOverride() return TRUE; } return FALSE; -}; +} void GotoNextMap() { @@ -1324,7 +1324,7 @@ void GotoNextMap() } Map_Goto(); } -}; +} /* @@ -1360,7 +1360,7 @@ void IntermissionThink() return; MapVote_Start(); -}; +} /* ============ @@ -1407,7 +1407,7 @@ entity FindIntermission() //objerror ("FindIntermission: no spot"); return world; -}; +} */ /* @@ -1623,7 +1623,7 @@ void CheckRules_Player() // fixme: don't check players; instead check spawnfunc_dom_team and spawnfunc_ctf_team entities // (div0: and that in CheckRules_World please) -}; +} float checkrules_equality; float checkrules_suddendeathwarning; @@ -2279,7 +2279,7 @@ void CheckRules_World() //print("WINNING\n"); NextLevel(); } -}; +} float mapvote_nextthink; float mapvote_initialized; @@ -2799,7 +2799,7 @@ void MapVote_Think() } MapVote_Tick(); -}; +} string GotoMap(string m) { diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc index f26f828ec..d0c513a93 100644 --- a/qcsrc/server/gamecommand.qc +++ b/qcsrc/server/gamecommand.qc @@ -385,7 +385,7 @@ void RadarMap_Think() else { // close the file - fputs(self.cnt, "};\n"); + fputs(self.cnt, "}\n"); fclose(self.cnt); print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); RadarMap_Next(); diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 489735585..4a860f03e 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -367,13 +367,13 @@ void spawnfunc_target_location() self.classname = "target_location"; // location name in netname // eventually support: count, teamgame selectors, line of sight? -}; +} void spawnfunc_info_location() { self.classname = "target_location"; self.message = self.netname; -}; +} string NearestLocation(vector p) { @@ -746,7 +746,7 @@ vector randompos(vector m1, vector m2) v_y = m2_y * random() + m1_y; v_z = m2_z * random() + m1_z; return v; -}; +} //#NO AUTOCVARS START diff --git a/qcsrc/server/mode_onslaught.qc b/qcsrc/server/mode_onslaught.qc index 33cfab2ec..f6e3de4cd 100644 --- a/qcsrc/server/mode_onslaught.qc +++ b/qcsrc/server/mode_onslaught.qc @@ -43,7 +43,7 @@ void ons_throwgib_think() if(d>2) if(random()<0.6) pointparticles(particleeffectnum("onslaught_generator_gib_flame"), self.origin, '0 0 0', 1); -}; +} void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, float b_burn) { @@ -70,7 +70,7 @@ void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, f } else SUB_SetFade(gib, gib.giblifetime, 2); -}; +} void onslaught_updatelinks() { @@ -258,7 +258,7 @@ void onslaught_updatelinks() dprint("--- game over ---\n"); else dprint("--- done updating links ---\n"); -}; +} float onslaught_controlpoint_can_be_linked(entity cp, float t) { @@ -406,12 +406,12 @@ void onslaught_generator_think() else if (overtime_msg_time) overtime_msg_time = 0; } -}; +} void onslaught_generator_ring_spawn(vector org) { modeleffect_spawn("models/onslaught/shockwavetransring.md3", 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, -16, 0.1, 1.25, 0.25); -}; +} void onslaught_generator_ray_think() { @@ -429,7 +429,7 @@ void onslaught_generator_ray_think() self.scale += 0.2; self.count +=1; -}; +} void onslaught_generator_ray_spawn(vector org) { @@ -442,12 +442,12 @@ void onslaught_generator_ray_spawn(vector org) e.scale = random() * 5 + 8; e.think = onslaught_generator_ray_think; e.nextthink = time + 0.05; -}; +} void onslaught_generator_shockwave_spawn(vector org) { shockwave_spawn("models/onslaught/shockwave.md3", org, -64, 0.75, 0.5); -}; +} void onslaught_generator_damage_think() { @@ -467,7 +467,7 @@ void onslaught_generator_damage_think() } else pointparticles(particleeffectnum("torch_small"), self.origin + randompos('-60 -60 -20', '60 60 60'), '0 0 0', 1); -}; +} void onslaught_generator_damage_spawn(entity gd_owner) { @@ -478,7 +478,7 @@ void onslaught_generator_damage_spawn(entity gd_owner) setorigin(e, gd_owner.origin); e.think = onslaught_generator_damage_think; e.nextthink = time+1; -}; +} void onslaught_generator_deaththink() { @@ -544,7 +544,7 @@ void onslaught_generator_deaththink() self.nextthink = time + 0.05; self.count = self.count - 1; -}; +} void onslaught_generator_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { @@ -664,7 +664,7 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage, if(random() < damage/200+0.2) if(random() < 0.5) ons_throwgib(hitloc + '0 0 20', randomvec()*360, "models/onslaught/gen_gib1.md3", 5, FALSE); -}; +} // update links after a delay void onslaught_generator_delayed() @@ -673,7 +673,7 @@ void onslaught_generator_delayed() // now begin normal thinking self.think = onslaught_generator_think; self.nextthink = time; -}; +} string onslaught_generator_waypointsprite_for_team(entity e, float t) { @@ -919,7 +919,7 @@ void spawnfunc_onslaught_generator() onslaught_updatelinks(); self.reset = onslaught_generator_reset; -}; +} .float waslinked; .float cp_bob_spd; @@ -1031,7 +1031,7 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float remove(self); } -}; +} void onslaught_controlpoint_icon_think() { @@ -1139,7 +1139,7 @@ void onslaught_controlpoint_icon_think() else if (random() > 0.5) sound(self, CH_PAIN, "onslaught/ons_spark2.wav", VOL_BASE, ATTN_NORM); } -}; +} void onslaught_controlpoint_icon_buildthink() { @@ -1188,7 +1188,7 @@ void onslaught_controlpoint_icon_buildthink() if(random() < 0.9 - self.health / self.max_health) pointparticles(particleeffectnum("rage"), self.origin + 10 * randomvec(), '0 0 -1', 1); -}; +} @@ -1228,7 +1228,7 @@ void onslaught_controlpoint_touch() self.colormap = e.colormap; WaypointSprite_UpdateBuildFinished(self.sprite, time + (e.max_health - e.health) / (e.count / sys_frametime)); onslaught_updatelinks(); -}; +} void onslaught_controlpoint_reset() { @@ -1320,7 +1320,7 @@ void spawnfunc_onslaught_controlpoint() onslaught_updatelinks(); self.reset = onslaught_controlpoint_reset; -}; +} float onslaught_link_send(entity to, float sendflags) { @@ -1424,4 +1424,4 @@ void spawnfunc_onslaught_link() objerror("target and target2 must be set\n"); InitializeEntity(self, onslaught_link_delayed, INITPRIO_FINDTARGET); Net_LinkEntity(self, FALSE, 0, onslaught_link_send); -}; +} diff --git a/qcsrc/server/monsters/ai.qc b/qcsrc/server/monsters/ai.qc index 4c179ce6d..59989e7a8 100644 --- a/qcsrc/server/monsters/ai.qc +++ b/qcsrc/server/monsters/ai.qc @@ -51,7 +51,7 @@ float(float v) anglemod = { v = v - 360 * floor(v / 360); return v; -}; +} /* ============================================================================== @@ -81,7 +81,7 @@ void() movetarget_f = self.solid = SOLID_TRIGGER; self.touch = t_movetarget; setsize (self, '-8 -8 -8', '8 8 8'); -}; +} /*QUAKED path_corner (0.5 0.3 0) (-8 -8 -8) (8 8 8) Monsters will continue walking towards the next target corner. @@ -89,7 +89,7 @@ Monsters will continue walking towards the next target corner. void() path_corner = { movetarget_f (); -}; +} /* ============= @@ -129,7 +129,7 @@ void() t_movetarget = self.th_stand (); return; } -}; +} void() monster_wanderpaththink = { @@ -158,7 +158,7 @@ void() monster_wanderpaththink = } setorigin(self, v1 + self.owner.origin); self.owner.ideal_yaw = vectoyaw(self.origin - self.owner.origin); -}; +} void() monster_wanderpathtouch = { @@ -175,7 +175,7 @@ void() monster_wanderpathtouch = sound (other, CHAN_VOICE, "ogre/ogdrag.wav", 1, ATTN_IDLE);// play chainsaw drag sound */ monster_wanderpaththink(); -}; +} void() monster_spawnwanderpath = { @@ -188,7 +188,7 @@ void() monster_spawnwanderpath = newmis.nextthink = time + random() * 10 + 1; newmis.owner = self; self.goalentity = self.movetarget = newmis; -}; +} void() monster_checkbossflag = { @@ -228,7 +228,7 @@ void() monster_checkbossflag = } #endif //#NO AUTOCVARS END -}; +} //============================================================================ @@ -255,7 +255,7 @@ float(entity targ) range = if (r < 2000) // increased from 1000 for DP return RANGE_MID; return RANGE_FAR; -}; +} /* ============= @@ -277,7 +277,7 @@ float (entity targ) visible = if (trace_fraction == 1) return TRUE; return FALSE; -}; +} /* @@ -295,7 +295,7 @@ float(entity targ) infront = dot = normalize (targ.origin - self.origin) * v_forward; return (dot > 0.3); -}; +} // returns 0 if not infront, or the dotproduct if infront float(vector dir, entity targ) infront2 = { @@ -306,7 +306,7 @@ float(vector dir, entity targ) infront2 = if (dot >= 0.3) return dot; // infront return 0; -}; +} //============================================================================ @@ -360,7 +360,7 @@ void() ChangeYaw = current_yaw = anglemod (current_yaw + move); self.angles_y = current_yaw; -}; +} */ @@ -374,7 +374,7 @@ void() HuntTarget = self.ideal_yaw = vectoyaw(self.enemy.origin - self.origin); self.nextthink = time + 0.1; SUB_AttackFinished (1); // wait a while before first attack -}; +} .void() th_sightsound; @@ -389,7 +389,7 @@ void() SightSound = if (self.th_sightsound) self.th_sightsound(); -}; +} void() FoundTarget = { @@ -408,7 +408,7 @@ void() FoundTarget = SightSound (); HuntTarget (); -}; +} /* //float checkplayertime; @@ -460,7 +460,7 @@ entity() checkplayer = } while(check != lastcheckplayer && c < 100); return world; -}; +} */ /* @@ -571,7 +571,7 @@ float() FindTarget = FoundTarget (); return TRUE; -}; +} //============================================================================= @@ -579,12 +579,12 @@ float() FindTarget = void(float dist) ai_forward = { walkmove (self.angles_y, dist); -}; +} void(float dist) ai_back = { walkmove ( (self.angles_y+180), dist); -}; +} void(float a) monster_setalpha; @@ -601,7 +601,7 @@ void(float dist) ai_pain = if (self.health < 1) return; ai_back (dist); -}; +} /* ============= @@ -615,7 +615,7 @@ void(float dist) ai_painforward = if (self.health < 1) return; walkmove (self.ideal_yaw, dist); -}; +} /* ============= @@ -662,7 +662,7 @@ void(float dist) ai_walk = movetogoal (dist); monster_setalpha(0); -}; +} /* @@ -704,7 +704,7 @@ void() ai_stand = // change angle slightly monster_setalpha(0); -}; +} /* ============= @@ -735,7 +735,7 @@ void() ai_turn = ChangeYaw (); monster_setalpha(0); -}; +} //============================================================================= @@ -767,7 +767,7 @@ void(vector pDestvec) ChooseTurn = dir_z = 0; self.ideal_yaw = vectoyaw(dir); -}; +} /* ============ @@ -783,7 +783,7 @@ float() FacingIdeal = if (delta > 45 && delta < 315) return FALSE; return TRUE; -}; +} //============================================================================= @@ -887,5 +887,5 @@ void(float dist) ai_run = // head straight in movetogoal (dist); // done in C code... -}; +} diff --git a/qcsrc/server/monsters/fight.qc b/qcsrc/server/monsters/fight.qc index 314838b9a..a8fcd8e70 100644 --- a/qcsrc/server/monsters/fight.qc +++ b/qcsrc/server/monsters/fight.qc @@ -140,7 +140,7 @@ float() GenericCheckAttack = } return FALSE; -}; +} /* @@ -154,7 +154,7 @@ void() ai_face = { self.ideal_yaw = vectoyaw(self.enemy.origin - self.origin); ChangeYaw (); -}; +} /* ============= @@ -173,7 +173,7 @@ void(float d) ai_charge = return; ai_face (); movetogoal (d); // done in C code... -}; +} void() ai_charge_side = { @@ -192,7 +192,7 @@ void() ai_charge_side = heading = vectoyaw(dtemp - self.origin); walkmove(heading, 20); -}; +} /* @@ -222,7 +222,7 @@ void() ai_melee = traceline(self.origin, self.enemy.origin, FALSE, self); Damage (self.enemy, self, self, ldmg, self.projectiledeathtype, trace_endpos, '0 0 0'); // TODO add force to monster melee attacks? -}; +} void() ai_melee_side = @@ -248,5 +248,5 @@ void() ai_melee_side = ldmg = ldmg + DMG_KNIGHT_MELEE_RANDOM3 * random(); traceline(self.origin, self.enemy.origin, FALSE, self); Damage (self.enemy, self, self, ldmg, self.projectiledeathtype, trace_endpos, '0 0 0'); -}; +} diff --git a/qcsrc/server/monsters/m_monsters.qc b/qcsrc/server/monsters/m_monsters.qc index c43538e02..3e160d97b 100644 --- a/qcsrc/server/monsters/m_monsters.qc +++ b/qcsrc/server/monsters/m_monsters.qc @@ -8,7 +8,7 @@ // self.nextthink = time + nexttime; // self.think = nextthink // -// }; +// } .float ismonster; @@ -58,7 +58,7 @@ void() monster_use = self.enemy = activator; self.nextthink = time + 0.1; self.think = FoundTarget; -}; +} void() monster_appearsetup = { @@ -72,7 +72,7 @@ void() monster_appearsetup = //self.movetype = MOVETYPE_NONE; self.nextthink = -1; self.model = ""; -}; +} /* ================ @@ -128,7 +128,7 @@ void(float a) monster_setalpha = } } self.alpha = SKILL4_MINALPHA + (1 - SKILL4_MINALPHA) * bound(0, a, 1); -}; +} /* ================ @@ -151,7 +151,7 @@ void() monster_death_use = activator = self.enemy; SUB_UseTargets (); -}; +} void() monsterinwall = @@ -169,7 +169,7 @@ void() monsterinwall = e.think = SUB_Null; e.nextthink = -1; e.scale = 16; -}; +} //============================================================================ @@ -264,7 +264,7 @@ void() walkmonster_start_go = force_retouch = 2; // mainly to detect teleports monster_appearsetup(); -}; +} void() walkmonster_start = @@ -281,7 +281,7 @@ void() walkmonster_start = self.ismonster = TRUE; monster_setalpha (0); -}; +} @@ -358,7 +358,7 @@ void() flymonster_start_go = force_retouch = 2; // mainly to detect teleports monster_appearsetup(); -}; +} void() flymonster_start = { @@ -373,7 +373,7 @@ void() flymonster_start = self.ismonster = TRUE; monster_setalpha (0); -}; +} void() swimmonster_start_go = @@ -447,7 +447,7 @@ void() swimmonster_start_go = force_retouch = 2; // mainly to detect teleports monster_appearsetup(); -}; +} void() swimmonster_start = { @@ -462,7 +462,7 @@ void() swimmonster_start = self.ismonster = TRUE; monster_setalpha(0); -}; +} void(vector org, float bodydamage, float armordamage, vector force, float damgtype) genericbleedfunc = { diff --git a/qcsrc/server/nexball.qc b/qcsrc/server/nexball.qc index a28620cd4..a068a33a5 100644 --- a/qcsrc/server/nexball.qc +++ b/qcsrc/server/nexball.qc @@ -414,7 +414,7 @@ void nb_spawnteam (string teamname, float teamcolor) e.cnt = teamcolor; e.team = e.cnt + 1; nb_teams += 1; -}; +} void nb_spawnteams (void) { diff --git a/qcsrc/server/t_halflife.qc b/qcsrc/server/t_halflife.qc index 26ad056f2..0a95b78d0 100644 --- a/qcsrc/server/t_halflife.qc +++ b/qcsrc/server/t_halflife.qc @@ -6,33 +6,33 @@ .float rendermode; .vector rendercolor; -void spawnfunc_weapon_crossbow() {}; -void spawnfunc_weapon_handgrenade() {}; -void spawnfunc_ammo_crossbow() {}; -void spawnfunc_ammo_9mmclip() {}; -void spawnfunc_ammo_gaussclip() {}; -void spawnfunc_weapon_rpg() {}; -void spawnfunc_weapon_357() {}; -void ammo_ARgrenades() {}; -void spawnfunc_item_battery() {}; -void spawnfunc_ammo_rpgclip() {}; -void weapon_9mmAR() {}; -void spawnfunc_weapon_tripmine() {}; -void spawnfunc_weapon_snark() {}; -void spawnfunc_ammo_buckshot() {}; -void ammo_9mmAR() {}; -void spawnfunc_ammo_357() {}; -void spawnfunc_weapon_gauss() {}; -void spawnfunc_weapon_hornetgun() {}; -//void spawnfunc_weapon_shotgun() {}; -void spawnfunc_item_healthkit() {}; -void spawnfunc_item_longjump() {}; -void spawnfunc_item_antidote() {}; -void spawnfunc_func_recharge() {}; -void spawnfunc_info_node() {}; -void spawnfunc_env_sound() {}; -void spawnfunc_light_spot() {}; -void spawnfunc_func_healthcharger() {}; +void spawnfunc_weapon_crossbow() {} +void spawnfunc_weapon_handgrenade() {} +void spawnfunc_ammo_crossbow() {} +void spawnfunc_ammo_9mmclip() {} +void spawnfunc_ammo_gaussclip() {} +void spawnfunc_weapon_rpg() {} +void spawnfunc_weapon_357() {} +void ammo_ARgrenades() {} +void spawnfunc_item_battery() {} +void spawnfunc_ammo_rpgclip() {} +void weapon_9mmAR() {} +void spawnfunc_weapon_tripmine() {} +void spawnfunc_weapon_snark() {} +void spawnfunc_ammo_buckshot() {} +void ammo_9mmAR() {} +void spawnfunc_ammo_357() {} +void spawnfunc_weapon_gauss() {} +void spawnfunc_weapon_hornetgun() {} +//void spawnfunc_weapon_shotgun() {} +void spawnfunc_item_healthkit() {} +void spawnfunc_item_longjump() {} +void spawnfunc_item_antidote() {} +void spawnfunc_func_recharge() {} +void spawnfunc_info_node() {} +void spawnfunc_env_sound() {} +void spawnfunc_light_spot() {} +void spawnfunc_func_healthcharger() {} void func_ladder_touch() @@ -46,17 +46,17 @@ void func_ladder_touch() other.ladder_time = time + 0.1; other.ladder_entity = self; -}; +} void spawnfunc_func_ladder() { EXACTTRIGGER_INIT; self.touch = func_ladder_touch; -}; +} void spawnfunc_func_water() { EXACTTRIGGER_INIT; self.touch = func_ladder_touch; -}; +} diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 03293e6fa..f7a8d2aec 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -559,7 +559,7 @@ void RemoveItem(void) // pickup evaluation functions // these functions decide how desirable an item is to the bots -float generic_pickupevalfunc(entity player, entity item) {return item.bot_pickupbasevalue;}; +float generic_pickupevalfunc(entity player, entity item) {return item.bot_pickupbasevalue;} float weapon_pickupevalfunc(entity player, entity item) { @@ -616,7 +616,7 @@ float weapon_pickupevalfunc(entity player, entity item) } return item.bot_pickupbasevalue * c; -}; +} float commodity_pickupevalfunc(entity player, entity item) { @@ -669,7 +669,7 @@ float commodity_pickupevalfunc(entity player, entity item) c = c + max(0, 1 - player.health / item.max_health); return item.bot_pickupbasevalue * c; -}; +} .float is_item; diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index abb0c306d..bf17e3faf 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -247,7 +247,7 @@ void trigger_push_touch() self.think = SUB_Remove; self.nextthink = time; } -}; +} .vector dest; void trigger_push_findtarget() @@ -303,7 +303,7 @@ void trigger_push_findtarget() waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity)); remove(e); } -}; +} /* * ENTITY PARAMETERS: @@ -338,8 +338,8 @@ void spawnfunc_trigger_push() // this must be called to spawn the teleport waypoints for bots InitializeEntity(self, trigger_push_findtarget, INITPRIO_FINDTARGET); -}; +} -void spawnfunc_target_push() {}; -void spawnfunc_info_notnull() {}; -void spawnfunc_target_position() {}; +void spawnfunc_target_push() {} +void spawnfunc_info_notnull() {} +void spawnfunc_target_position() {} diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index 7cd996555..9ac9df289 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -58,7 +58,7 @@ void plat_spawn_inside_trigger() } setsize (trigger, tmin, tmax); -}; +} void plat_hit_top() { @@ -66,27 +66,27 @@ void plat_hit_top() self.state = 1; self.think = plat_go_down; self.nextthink = self.ltime + 3; -}; +} void plat_hit_bottom() { sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTN_NORM); self.state = 2; -}; +} void plat_go_down() { sound (self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE, ATTN_NORM); self.state = 3; SUB_CalcMove (self.pos2, self.speed, plat_hit_bottom); -}; +} void plat_go_up() { sound (self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE, ATTN_NORM); self.state = 4; SUB_CalcMove (self.pos1, self.speed, plat_hit_top); -}; +} void plat_center_touch() { @@ -101,7 +101,7 @@ void plat_center_touch() plat_go_up (); else if (self.state == 1) self.nextthink = self.ltime + 1; // delay going down -}; +} void plat_outside_touch() { @@ -114,14 +114,14 @@ void plat_outside_touch() self = self.enemy; if (self.state == 1) plat_go_down (); -}; +} void plat_trigger_use() { if (self.think) return; // already activated plat_go_down(); -}; +} void plat_crush() @@ -144,7 +144,7 @@ void plat_crush() // plat state already had changed // this isn't a bug per se! } -}; +} void plat_use() { @@ -152,7 +152,7 @@ void plat_use() if (self.state != 4) objerror ("plat_use: not in up state"); plat_go_down(); -}; +} .string sound1, sound2; @@ -172,7 +172,7 @@ void plat_reset() } } -void spawnfunc_path_corner() { }; +void spawnfunc_path_corner() { } void spawnfunc_func_plat() { if (!self.t_length) @@ -240,7 +240,7 @@ void spawnfunc_func_plat() self.reset = plat_reset; plat_reset(); -}; +} void() train_next; @@ -265,7 +265,7 @@ void train_wait() SUB_UseTargets(); self = oldself; self.enemy = world; -}; +} void train_next() { @@ -286,7 +286,7 @@ void train_next() if(self.noise != "") sound(self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE, ATTN_IDLE); -}; +} void func_train_find() { @@ -298,7 +298,7 @@ void func_train_find() setorigin(self, targ.origin - self.mins); self.nextthink = self.ltime + 1; self.think = train_next; -}; +} /*QUAKED spawnfunc_func_train (0 .5 .8) ? Ridable platform, targets spawnfunc_path_corner path to follow. @@ -332,7 +332,7 @@ void spawnfunc_func_train() self.dmgtime2 = time; // TODO make a reset function for this one -}; +} void func_rotating_setactive(float astate) { @@ -408,7 +408,7 @@ void spawnfunc_func_rotating() self.think = SUB_Null; // TODO make a reset function for this one -}; +} .float height; void func_bobbing_controller_think() @@ -428,7 +428,7 @@ void func_bobbing_controller_think() if(self.owner.classname == "func_bobbing") // don't brake stuff if the func_bobbing was killtarget'ed // * 10 so it will arrive in 0.1 sec self.owner.velocity = (v - self.owner.origin) * 10; -}; +} /*QUAKED spawnfunc_func_bobbing (0 .5 .8) ? X_AXIS Y_AXIS Brush model that moves back and forth on one axis (default Z). @@ -492,7 +492,7 @@ void spawnfunc_func_bobbing() self.effects |= EF_LOWPRECISION; // TODO make a reset function for this one -}; +} .float freq; void func_pendulum_controller_think() @@ -514,7 +514,7 @@ void func_pendulum_controller_think() // * 10 so it will arrive in 0.1 sec self.owner.avelocity_z = (remainder(v - self.owner.angles_z, 360)) * 10; } -}; +} void spawnfunc_func_pendulum() { @@ -568,7 +568,7 @@ void spawnfunc_func_pendulum() //self.effects |= EF_LOWPRECISION; // TODO make a reset function for this one -}; +} // button and multiple button @@ -583,12 +583,12 @@ void button_wait() activator = self.enemy; SUB_UseTargets(); self.frame = 1; // use alternate textures -}; +} void button_done() { self.state = STATE_BOTTOM; -}; +} void button_return() { @@ -597,13 +597,13 @@ void button_return() self.frame = 0; // use normal textures if (self.health) self.takedamage = DAMAGE_YES; // can be shot again -}; +} void button_blocked() { // do nothing, just don't come all the way back out -}; +} void button_fire() @@ -619,7 +619,7 @@ void button_fire() self.state = STATE_UP; SUB_CalcMove (self.pos2, self.speed, button_wait); -}; +} void button_reset() { @@ -644,7 +644,7 @@ void button_use() self.enemy = activator; button_fire (); -}; +} void button_touch() { @@ -663,7 +663,7 @@ void button_touch() if (other.owner) self.enemy = other.owner; button_fire (); -}; +} void button_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { @@ -681,7 +681,7 @@ void button_damage(entity inflictor, entity attacker, float damage, float deatht self.enemy = damage_attacker; button_fire (); } -}; +} /*QUAKED spawnfunc_func_button (0 .5 .8) ? @@ -738,7 +738,7 @@ void spawnfunc_func_button() self.flags |= FL_NOTARGET; button_reset(); -}; +} float DOOR_START_OPEN = 1; @@ -820,7 +820,7 @@ void door_blocked() door_go_down (); } */ -}; +} void door_hit_top() @@ -838,14 +838,14 @@ void door_hit_top() self.think = door_rotating_go_down; } self.nextthink = self.ltime + self.wait; -}; +} void door_hit_bottom() { if (self.noise1 != "") sound (self, CH_TRIGGER_SINGLE, self.noise1, VOL_BASE, ATTN_NORM); self.state = STATE_BOTTOM; -}; +} void door_go_down() { @@ -859,7 +859,7 @@ void door_go_down() self.state = STATE_DOWN; SUB_CalcMove (self.pos1, self.speed, door_hit_bottom); -}; +} void door_go_up() { @@ -882,7 +882,7 @@ void door_go_up() self.message = ""; SUB_UseTargets(); self.message = oldmessage; -}; +} /* @@ -950,7 +950,7 @@ void door_fire() self = self.enemy; } while ( (self != starte) && (self != world) ); self = oself; -}; +} void door_use() @@ -965,7 +965,7 @@ void door_use() door_fire (); self = oself; } -}; +} void door_trigger_touch() @@ -982,7 +982,7 @@ void door_trigger_touch() self = self.owner; door_use (); -}; +} void door_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) @@ -1001,7 +1001,7 @@ void door_damage(entity inflictor, entity attacker, float damage, float deathtyp door_use (); self = oself; } -}; +} /* @@ -1026,7 +1026,7 @@ void door_touch() centerprint (other, self.owner.message); play2(other, "misc/talk.wav"); } -}; +} void door_generic_plat_blocked() @@ -1066,7 +1066,7 @@ void door_generic_plat_blocked() door_rotating_go_down (); } */ -}; +} void door_rotating_hit_top() @@ -1078,7 +1078,7 @@ void door_rotating_hit_top() return; // don't come down automatically self.think = door_rotating_go_down; self.nextthink = self.ltime + self.wait; -}; +} void door_rotating_hit_bottom() { @@ -1090,7 +1090,7 @@ void door_rotating_hit_bottom() self.lip = 0; } self.state = STATE_BOTTOM; -}; +} void door_rotating_go_down() { @@ -1104,7 +1104,7 @@ void door_rotating_go_down() self.state = STATE_DOWN; SUB_CalcAngleMove (self.pos1, self.speed, door_rotating_hit_bottom); -}; +} void door_rotating_go_up() { @@ -1126,7 +1126,7 @@ void door_rotating_go_up() self.message = ""; SUB_UseTargets(); self.message = oldmessage; -}; +} @@ -1156,7 +1156,7 @@ entity spawn_field(vector fmins, vector fmaxs) t2 = fmaxs; setsize (trigger, t1 - '60 60 8', t2 + '60 60 8'); return (trigger); -}; +} float EntitiesTouching(entity e1, entity e2) @@ -1174,7 +1174,7 @@ float EntitiesTouching(entity e1, entity e2) if (e1.absmax_z < e2.absmin_z) return FALSE; return TRUE; -}; +} /* @@ -1268,7 +1268,7 @@ void LinkDoors() } } while (1 ); -}; +} /*QUAKED spawnfunc_func_door (0 .5 .8) ? START_OPEN x DOOR_DONT_LINK x x TOGGLE @@ -1375,7 +1375,7 @@ void spawnfunc_func_door() InitializeEntity(self, LinkDoors, INITPRIO_LINKDOORS); self.reset = door_reset; -}; +} /*QUAKED spawnfunc_func_door_rotating (0 .5 .8) ? START_OPEN BIDIR DOOR_DONT_LINK BIDIR_IN_DOWN x TOGGLE X_AXIS Y_AXIS if two doors touch, they are assumed to be connected and operate as a unit. @@ -1499,7 +1499,7 @@ void spawnfunc_func_door_rotating() InitializeEntity(self, LinkDoors, INITPRIO_LINKDOORS); self.reset = door_rotating_reset; -}; +} /* ============================================================================= @@ -1572,7 +1572,7 @@ void fd_secret_use() SUB_CalcMove(self.dest1, self.speed, fd_secret_move1); if (self.noise2 != "") sound(self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTN_NORM); -}; +} // Wait after first movement... void fd_secret_move1() @@ -1581,7 +1581,7 @@ void fd_secret_move1() self.think = fd_secret_move2; if (self.noise3 != "") sound(self, CH_TRIGGER_SINGLE, self.noise3, VOL_BASE, ATTN_NORM); -}; +} // Start moving sideways w/sound... void fd_secret_move2() @@ -1589,7 +1589,7 @@ void fd_secret_move2() if (self.noise2 != "") sound(self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTN_NORM); SUB_CalcMove(self.dest2, self.speed, fd_secret_move3); -}; +} // Wait here until time to go back... void fd_secret_move3() @@ -1601,7 +1601,7 @@ void fd_secret_move3() self.nextthink = self.ltime + self.wait; self.think = fd_secret_move4; } -}; +} // Move backward... void fd_secret_move4() @@ -1609,7 +1609,7 @@ void fd_secret_move4() if (self.noise2 != "") sound(self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTN_NORM); SUB_CalcMove(self.dest1, self.speed, fd_secret_move5); -}; +} // Wait 1 second... void fd_secret_move5() @@ -1618,14 +1618,14 @@ void fd_secret_move5() self.think = fd_secret_move6; if (self.noise3 != "") sound(self, CH_TRIGGER_SINGLE, self.noise3, VOL_BASE, ATTN_NORM); -}; +} void fd_secret_move6() { if (self.noise2 != "") sound(self, CH_TRIGGER_SINGLE, self.noise2, VOL_BASE, ATTN_NORM); SUB_CalcMove(self.oldorigin, self.speed, fd_secret_done); -}; +} void fd_secret_done() { @@ -1637,7 +1637,7 @@ void fd_secret_done() } if (self.noise3 != "") sound(self, CH_TRIGGER_SINGLE, self.noise3, VOL_BASE, ATTN_NORM); -}; +} void secret_blocked() { @@ -1645,7 +1645,7 @@ void secret_blocked() return; self.attack_finished_single = time + 0.5; //T_Damage (other, self, self, self.dmg, self.dmg, self.deathtype, DT_IMPACT, (self.absmin + self.absmax) * 0.5, '0 0 0', Obituary_Generic); -}; +} /* ============== @@ -1669,7 +1669,7 @@ void secret_touch() centerprint (other, self.message); play2(other, "misc/talk.wav"); } -}; +} void secret_reset() { @@ -1737,7 +1737,7 @@ void spawnfunc_func_door_secret() self.reset = secret_reset; secret_reset(); -}; +} /*QUAKED spawnfunc_func_fourier (0 .5 .8) ? Brush model that moves in a pattern of added up sine waves, can be used e.g. for circular motions. @@ -1777,7 +1777,7 @@ void func_fourier_controller_think() if(self.owner.classname == "func_fourier") // don't brake stuff if the func_fourier was killtarget'ed // * 10 so it will arrive in 0.1 sec self.owner.velocity = (v - self.owner.origin) * 10; -}; +} void spawnfunc_func_fourier() { @@ -1825,7 +1825,7 @@ void spawnfunc_func_fourier() self.effects |= EF_LOWPRECISION; // TODO make a reset function for this one -}; +} // reusing some fields havocbots declared .entity wp00, wp01, wp02, wp03; diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc index 45ab457f2..f415e1fd1 100644 --- a/qcsrc/server/t_quake3.qc +++ b/qcsrc/server/t_quake3.qc @@ -164,7 +164,7 @@ float DoesQ3ARemoveThisEntity() if(self.gametype) { string gametypename; - // static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"}; + // static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"} gametypename = "ffa"; if(teamplay) gametypename = "team"; diff --git a/qcsrc/server/t_swamp.qc b/qcsrc/server/t_swamp.qc index 5ad7e62cb..4f3e54420 100644 --- a/qcsrc/server/t_swamp.qc +++ b/qcsrc/server/t_swamp.qc @@ -98,4 +98,4 @@ void spawnfunc_trigger_swamp(void) self.swamp_interval = 1; if(self.swamp_slowdown <= 0) self.swamp_slowdown = 0.5; -}; +} diff --git a/qcsrc/server/target_spawn.qc b/qcsrc/server/target_spawn.qc index 1253fe1c0..e04e2cad8 100644 --- a/qcsrc/server/target_spawn.qc +++ b/qcsrc/server/target_spawn.qc @@ -345,4 +345,4 @@ void trigger_relay_if_use() void spawnfunc_trigger_relay_if() { self.use = trigger_relay_if_use; -}; +} diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index dbba54c4d..173e6ec27 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -1281,7 +1281,7 @@ void tdm_spawnteam (string teamname, float teamcolor) e.netname = teamname; e.cnt = teamcolor; e.team = e.cnt + 1; -}; +} // spawn some default teams if the map is not set up for tdm void tdm_spawnteams() @@ -1299,16 +1299,16 @@ void tdm_spawnteams() tdm_spawnteam("Yellow", COLOR_TEAM3-1); if(numteams >= 4) tdm_spawnteam("Pink", COLOR_TEAM4-1); -}; +} void tdm_delayedinit() { // if no teams are found, spawn defaults if (find(world, classname, "tdm_team") == world) tdm_spawnteams(); -}; +} void tdm_init() { InitializeEntity(world, tdm_delayedinit, INITPRIO_GAMETYPE); -}; +} diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index 0c3faddd4..0b3118bb6 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -634,7 +634,7 @@ float w_crylink(float req) W_Reload(min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo), autocvar_g_balance_crylink_reload_ammo, autocvar_g_balance_crylink_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_crylink(float req) diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 09f684d9c..c52043b97 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -538,7 +538,7 @@ float w_electro(float req) W_Reload(min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo), autocvar_g_balance_electro_reload_ammo, autocvar_g_balance_electro_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_electro(float req) diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 3d90fe398..3cc484da9 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -391,7 +391,7 @@ float w_fireball(float req) W_Reload(min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo), autocvar_g_balance_fireball_reload_ammo, autocvar_g_balance_fireball_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_fireball(float req) diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index b5bfa47a2..bb073a988 100644 --- a/qcsrc/server/w_grenadelauncher.qc +++ b/qcsrc/server/w_grenadelauncher.qc @@ -365,7 +365,7 @@ float w_glauncher(float req) W_Reload(min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo), autocvar_g_balance_grenadelauncher_reload_ammo, autocvar_g_balance_grenadelauncher_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_glauncher(float req) diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index b0106a28e..12abae6ea 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -432,7 +432,7 @@ float w_hagar(float req) W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_hagar(float req) diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc index 9359ab44f..c8ea61ed6 100644 --- a/qcsrc/server/w_hlac.qc +++ b/qcsrc/server/w_hlac.qc @@ -153,7 +153,7 @@ void HLAC_fire1_02() { weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hlac_primary_animtime, w_ready); } -}; +} void spawnfunc_weapon_hlac (void) { @@ -219,7 +219,7 @@ float w_hlac(float req) W_Reload(min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo), autocvar_g_balance_hlac_reload_ammo, autocvar_g_balance_hlac_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_hlac(float req) diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc index 8a93b0da2..6feacc7d5 100644 --- a/qcsrc/server/w_hook.qc +++ b/qcsrc/server/w_hook.qc @@ -265,7 +265,7 @@ float w_hook(float req) self.hook_refire = time; } return TRUE; -}; +} #endif #ifdef CSQC float w_hook(float req) diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc index a34695ee8..3da9e422b 100644 --- a/qcsrc/server/w_laser.qc +++ b/qcsrc/server/w_laser.qc @@ -291,7 +291,7 @@ float w_laser(float req) W_Reload(0, autocvar_g_balance_laser_reload_ammo, autocvar_g_balance_laser_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_laser(float req) diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc index 1012f9a81..03c265128 100644 --- a/qcsrc/server/w_minelayer.qc +++ b/qcsrc/server/w_minelayer.qc @@ -511,7 +511,7 @@ float w_minelayer(float req) W_Reload(autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo, autocvar_g_balance_minelayer_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_minelayer(float req) diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 10014a7e1..6901e2b2d 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -272,7 +272,7 @@ float w_minstanex(float req) W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_minstanex(float req) diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index 802298912..994864dce 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -232,7 +232,7 @@ float w_nex(float req) } return TRUE; -}; +} #endif #ifdef CSQC float w_nex(float req) diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc index 9fb318fd9..fb8e427cc 100644 --- a/qcsrc/server/w_porto.qc +++ b/qcsrc/server/w_porto.qc @@ -279,7 +279,7 @@ float w_porto(float req) self.porto_current = world; } return TRUE; -}; +} #endif #ifdef CSQC float w_porto(float req) diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/server/w_rifle.qc index 941a528a4..43f8a6cfb 100644 --- a/qcsrc/server/w_rifle.qc +++ b/qcsrc/server/w_rifle.qc @@ -201,7 +201,7 @@ float w_rifle(float req) W_Reload(min(autocvar_g_balance_rifle_primary_ammo, autocvar_g_balance_rifle_secondary_ammo), autocvar_g_balance_rifle_reload_ammo, autocvar_g_balance_rifle_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_rifle(float req) diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc index 1584e7aa5..11b39527e 100644 --- a/qcsrc/server/w_rocketlauncher.qc +++ b/qcsrc/server/w_rocketlauncher.qc @@ -486,7 +486,7 @@ float w_rlauncher(float req) W_Reload(autocvar_g_balance_rocketlauncher_ammo, autocvar_g_balance_rocketlauncher_reload_ammo, autocvar_g_balance_rocketlauncher_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_rlauncher(float req) diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 4eb710764..83a374ea7 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -606,7 +606,7 @@ float w_seeker(float req) W_Reload(min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo), autocvar_g_balance_seeker_reload_ammo, autocvar_g_balance_seeker_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_seeker(float req) diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index ec6a491ab..7130599de 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -235,7 +235,7 @@ float w_shotgun(float req) W_Reload(autocvar_g_balance_shotgun_primary_ammo, autocvar_g_balance_shotgun_reload_ammo, autocvar_g_balance_shotgun_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC .float prevric; diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc index 987e7b41e..62160715a 100644 --- a/qcsrc/server/w_tuba.qc +++ b/qcsrc/server/w_tuba.qc @@ -267,7 +267,7 @@ float w_tuba(float req) else if (req == WR_CHECKAMMO2) return TRUE; // TODO use fuel? return TRUE; -}; +} #endif #ifdef CSQC float w_tuba(float req) diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc index 71ea1f6f6..f5bacd220 100644 --- a/qcsrc/server/w_uzi.qc +++ b/qcsrc/server/w_uzi.qc @@ -290,7 +290,7 @@ float w_uzi(float req) W_Reload(min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo), autocvar_g_balance_uzi_reload_ammo, autocvar_g_balance_uzi_reload_time, "weapons/reload.wav"); } return TRUE; -}; +} #endif #ifdef CSQC float w_uzi(float req) -- 2.39.2