Clean up macros

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 9a69aced85cb2eb20bb0bd778802b7af90864d06..a2d728d0e3795b7447e97a51d4274e5961b1c520 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -1334,10 +1334,11 @@ void CSQC_UpdateView(float w, float h)
                        camera_active = false;
                }
        }
+       else
 #ifdef CAMERATEST
-       else if(autocvar_camera_enable)
+       if(autocvar_camera_enable)
 #else
-       else if(autocvar_camera_enable && isdemo())
+       if(autocvar_camera_enable && isdemo())
 #endif
        {
                // Enable required Darkplaces cvars

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index e8f3600d48156351c1d536661b376218ee86c92f..edf265625aa21bb45eee669a8cdfafade443a115 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -416,7 +416,7 @@ void LocalCommand_macro_help()
        #define CLIENT_COMMAND(name,function,description) \
                { if(strtolower(description) != "") { print("  ^2", name, "^7: ", description, "\n"); } }
 
-       CLIENT_COMMANDS(0, 0)
+       CLIENT_COMMANDS(0, 0);
        #undef CLIENT_COMMAND
 
        return;
@@ -427,7 +427,7 @@ bool LocalCommand_macro_command(int argc)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc)
+       CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc);
        #undef CLIENT_COMMAND
 
        return false;
@@ -438,7 +438,7 @@ bool LocalCommand_macro_usage(int argc)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc)
+       CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc);
        #undef CLIENT_COMMAND
 
        return false;
@@ -449,7 +449,7 @@ void LocalCommand_macro_write_aliases(int fh)
        #define CLIENT_COMMAND(name,function,description) \
                { if(strtolower(description) != "") { CMD_Write_Alias("qc_cmd_cl", name, description); } }
 
-       CLIENT_COMMANDS(0, 0)
+       CLIENT_COMMANDS(0, 0);
        #undef CLIENT_COMMAND
 
        return;
@@ -516,14 +516,14 @@ void GameCommand(string command)
 
 // These functions are here specifically to add special + - commands to the game, and are not really normal commands.
 // Please add client commands to the function above this, as this is only for special reasons.
-#define CONSOLE_COMMANDS_NORMAL \
+#define CONSOLE_COMMANDS_NORMAL() \
        CONSOLE_COMMAND("+showscores", { scoreboard_showscores = true; }) \
        CONSOLE_COMMAND("-showscores", { scoreboard_showscores = false; }) \
        CONSOLE_COMMAND("+showaccuracy", { scoreboard_showaccuracy = true; }) \
        CONSOLE_COMMAND("-showaccuracy", { scoreboard_showaccuracy = false; }) \
        /* nothing */
 
-#define CONSOLE_COMMANDS_MOVEMENT \
+#define CONSOLE_COMMANDS_MOVEMENT() \
        CONSOLE_COMMAND("+forward", { ++camera_direction.x; }) \
        CONSOLE_COMMAND("-forward", { --camera_direction.x; }) \
        CONSOLE_COMMAND("+back", { --camera_direction.x; }) \
@@ -548,7 +548,7 @@ void ConsoleCommand_macro_init()
        #define CONSOLE_COMMAND(name,execution) \
                { registercommand(name); }
 
-       CONSOLE_COMMANDS_NORMAL
+       CONSOLE_COMMANDS_NORMAL();
        #undef CONSOLE_COMMAND
 
        // then init movement commands
@@ -559,7 +559,7 @@ void ConsoleCommand_macro_init()
                #define CONSOLE_COMMAND(name,execution) \
                        { registercommand(name); }
 
-               CONSOLE_COMMANDS_MOVEMENT
+               CONSOLE_COMMANDS_MOVEMENT();
                #undef CONSOLE_COMMAND
        #ifndef CAMERATEST
        }
@@ -573,7 +573,7 @@ bool ConsoleCommand_macro_normal(int argc)
        #define CONSOLE_COMMAND(name,execution) \
                { if(name == strtolower(argv(0))) { { execution } return true; } }
 
-       CONSOLE_COMMANDS_NORMAL
+       CONSOLE_COMMANDS_NORMAL();
        #undef CONSOLE_COMMAND
 
        return false;
@@ -586,7 +586,7 @@ bool ConsoleCommand_macro_movement(int argc)
                #define CONSOLE_COMMAND(name,execution) \
                        { if(name == strtolower(argv(0))) { { execution } return true; } }
 
-               CONSOLE_COMMANDS_MOVEMENT
+               CONSOLE_COMMANDS_MOVEMENT();
                #undef CONSOLE_COMMAND
        }
 

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index e174429feae171e9c954c7b7c3cca667b1d9905b..9a311fab98379ef9e300197eacb7b46c89e96af3 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -322,16 +322,15 @@ void CSQCPlayer_FallbackFrame_PostUpdate(bool isnew)
        // player "pops in"
        if(isnew)
        {
-#define FIX_FRAMETIME(f,ft) \
-               if(IS_DEAD_FRAME(self.f) && self.ft != 0 && self.death_time != 0) \
-               { \
-                       self.ft = self.death_time; \
-               }
-               FIX_FRAMETIME(frame, frame1time)
-               FIX_FRAMETIME(frame2, frame2time)
+#define FIX_FRAMETIME(f,ft) do {                                                                                                                                                                       \
+               if(IS_DEAD_FRAME(self.f) && self.ft != 0 && self.death_time != 0)                                                                                       \
+                       self.ft = self.death_time;                                                                                                                                                              \
+} while(0)
+               FIX_FRAMETIME(frame, frame1time);
+               FIX_FRAMETIME(frame2, frame2time);
 #ifdef CSQCMODEL_HAVE_TWO_FRAMES
-               FIX_FRAMETIME(frame3, frame3time)
-               FIX_FRAMETIME(frame4, frame4time)
+               FIX_FRAMETIME(frame3, frame3time);
+               FIX_FRAMETIME(frame4, frame4time);
 #endif
        }
        self.csqcmodel_isdead = IS_DEAD_FRAME(self.frame);

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index ac1208d7e3ad1c180334bc4c7af5547c5972cae2..9c733efbde33d63a1d6de74fc32b775570808742 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -263,9 +263,10 @@ HUD panels
 */
 
 // draw the background/borders
-#define HUD_Panel_DrawBg(theAlpha)\
-if(panel.current_panel_bg != "0" && panel.current_panel_bg != "")\
-       draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER))
+#define HUD_Panel_DrawBg(theAlpha) do {                                                                                                                                                                \
+       if(panel.current_panel_bg != "0" && panel.current_panel_bg != "")                                                                                               \
+               draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\
+} while(0)
 
 //basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu
 void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, float vertical, float baralign, vector theColor, float theAlpha, float drawflag)
@@ -3624,11 +3625,12 @@ void HUD_EngineInfo(void)
 
 // Info messages panel (#14)
 //
-#define drawInfoMessage(s)\
-       if(autocvar_hud_panel_infomessages_flip)\
-               o_x = pos.x + mySize.x - stringwidth(s, true, fontsize);\
-       drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);\
-       o.y += fontsize.y;
+#define drawInfoMessage(s) do {                                                                                                                                                                                \
+       if(autocvar_hud_panel_infomessages_flip)                                                                                                                                                \
+               o_x = pos.x + mySize.x - stringwidth(s, true, fontsize);                                                                                                        \
+       drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);                                                                                                               \
+       o.y += fontsize.y;                                                                                                                                                                                              \
+} while(0)
 void HUD_InfoMessages(void)
 {
        if(!autocvar__hud_configure)
@@ -3686,22 +3688,22 @@ void HUD_InfoMessages(void)
                                s = _("^1Observing");
                        else
                                s = sprintf(_("^1Spectating: ^7%s"), GetPlayerName(player_localentnum - 1));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
 
                        if(spectatee_status == -1)
                                s = sprintf(_("^1Press ^3%s^1 to spectate"), getcommandkey("primary fire", "+fire"));
                        else
                                s = sprintf(_("^1Press ^3%s^1 or ^3%s^1 for next or previous player"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
 
                        if(spectatee_status == -1)
                                s = sprintf(_("^1Use ^3%s^1 or ^3%s^1 to change the speed"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
                        else
                                s = sprintf(_("^1Press ^3%s^1 to observe"), getcommandkey("secondary fire", "+fire2"));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
 
                        s = sprintf(_("^1Press ^3%s^1 for gamemode info"), getcommandkey("server info", "+show_info"));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
 
                        if(gametype == MAPINFO_TYPE_LMS)
                        {
@@ -3716,7 +3718,7 @@ void HUD_InfoMessages(void)
                        }
                        else
                                s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump"));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
 
                        //show restart countdown:
                        if (time < getstatf(STAT_GAMESTARTTIME)) {
@@ -3731,7 +3733,7 @@ void HUD_InfoMessages(void)
                if(warmup_stage && !intermission)
                {
                        s = _("^2Currently in ^1warmup^2 stage!");
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
                }
 
                string blinkcolor;
@@ -3756,12 +3758,12 @@ void HUD_InfoMessages(void)
                                else
                                        s = _("^2Waiting for others to ready up...");
                        }
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
                }
                else if(warmup_stage && !intermission && !spectatee_status)
                {
                        s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready"));
-                       drawInfoMessage(s)
+                       drawInfoMessage(s);
                }
 
                if(teamplay && !intermission && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger)
@@ -3787,7 +3789,7 @@ void HUD_InfoMessages(void)
                                        if (tm.team != NUM_SPECTATOR)
                                        if (tm.team_size == ts_max)
                                                s = strcat(s, sprintf(_(" Press ^3%s%s to adjust"), getcommandkey("team menu", "menu_showteamselect"), blinkcolor));
-                                       drawInfoMessage(s)
+                                       drawInfoMessage(s);
                                }
                        }
                }
@@ -3795,13 +3797,13 @@ void HUD_InfoMessages(void)
        else
        {
                s = _("^7Press ^3ESC ^7to show HUD options.");
-               drawInfoMessage(s)
+               drawInfoMessage(s);
                s = _("^3Doubleclick ^7a panel for panel-specific options.");
-               drawInfoMessage(s)
+               drawInfoMessage(s);
                s = _("^3CTRL ^7to disable collision testing, ^3SHIFT ^7and");
-               drawInfoMessage(s)
+               drawInfoMessage(s);
                s = _("^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments.");
-               drawInfoMessage(s)
+               drawInfoMessage(s);
        }
 }
 

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index 861011f3b9f37808ec70dd2885d354b9fcd0e044..d6a3d7d9c21a132710a5ae6e378ba1b66a62d34d 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -19,7 +19,7 @@ void Draw_Laser()
        {
                if(self.count & 0x10)
                {
-                       trace_endpos = self.velocity,
+                       trace_endpos = self.velocity;
                        trace_dphitq3surfaceflags = 0;
                }
                else

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index a07ad14f9099703b1a63cc433a1eb808037f9511..fcc248220d4af90ecdb4ad3131f66151e931d6c5 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -320,28 +320,29 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc
        drawpic_aspect_skin_expanding(position, pic, theScale, rgb, theAlpha, flag, fadelerp);
        drawpic_skin(position, pic, theScale, rgb, theAlpha * fadelerp, flag);
 }
-#define SET_POS_AND_SZ_Y_ASPECT(allow_colors)\
-       float textaspect, oldsz;\
-       textaspect = stringwidth(text, allow_colors, '1 1 1' * sz.y) / sz.y;\
-       if(sz.x/sz.y > textaspect) {\
-               oldsz = sz.x;\
-               sz_x = sz.y * textaspect;\
-               pos.x += (oldsz - sz.x) * 0.5;\
-       } else {\
-               oldsz = sz.y;\
-               sz_y = sz.x / textaspect; \
-               pos.y += (oldsz - sz.y) * 0.5;\
-       }
+#define SET_POS_AND_SZ_Y_ASPECT(allow_colors) do {                                                                                                                                     \
+       float textaspect, oldsz;                                                                                                                                                                                \
+       textaspect = stringwidth(text, allow_colors, '1 1 1' * sz.y) / sz.y;                                                                                    \
+       if(sz.x/sz.y > textaspect) {                                                                                                                                                                    \
+               oldsz = sz.x;                                                                                                                                                                                           \
+               sz_x = sz.y * textaspect;                                                                                                                                                                       \
+               pos.x += (oldsz - sz.x) * 0.5;                                                                                                                                                          \
+       } else {                                                                                                                                                                                                                \
+               oldsz = sz.y;                                                                                                                                                                                           \
+               sz_y = sz.x / textaspect;                                                                                                                                                                       \
+               pos.y += (oldsz - sz.y) * 0.5;                                                                                                                                                          \
+       }                                                                                                                                                                                                                               \
+} while(0)
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
 void drawstring_aspect(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag) {
-       SET_POS_AND_SZ_Y_ASPECT(false)
+       SET_POS_AND_SZ_Y_ASPECT(false);
        drawstring(pos, text, '1 1 0' * sz.y, color, theAlpha, drawflag);
 }
 
 // drawstring wrapper to draw a colorcodedstring as large as possible with preserved aspect ratio into a box
 void drawcolorcodedstring_aspect(vector pos, string text, vector sz, float theAlpha, float drawflag) {
-       SET_POS_AND_SZ_Y_ASPECT(true)
+       SET_POS_AND_SZ_Y_ASPECT(true);
        drawcolorcodedstring(pos, text, '1 1 0' * sz.y, theAlpha, drawflag);
 }
 
@@ -362,7 +363,7 @@ void drawstring_expanding(vector position, string text, vector theScale, vector
 
 // drawstring wrapper to draw a string as large as possible with preserved aspect ratio into a box
 void drawstring_aspect_expanding(vector pos, string text, vector sz, vector color, float theAlpha, float drawflag, float fadelerp) {
-       SET_POS_AND_SZ_Y_ASPECT(false)
+       SET_POS_AND_SZ_Y_ASPECT(false);
        drawstring_expanding(pos, text, '1 1 0' * sz.y, color, theAlpha, drawflag, fadelerp);
 }
 
@@ -378,7 +379,7 @@ void drawcolorcodedstring_expanding(vector position, string text, vector theScal
 }
 
 void drawcolorcodedstring_aspect_expanding(vector pos, string text, vector sz, float theAlpha, float drawflag, float fadelerp) {
-       SET_POS_AND_SZ_Y_ASPECT(true)
+       SET_POS_AND_SZ_Y_ASPECT(true);
        drawcolorcodedstring_expanding(pos, text, '1 1 0' * sz.y, theAlpha, drawflag, fadelerp);
 }
 

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index d6b913a1828ee8436ad12a3cbc5acf9143ba1f2d..0eeb7f7b4e470f83f317484650f32b5b1344e6a8 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -643,7 +643,7 @@ void GenericCommand_macro_help()
        #define GENERIC_COMMAND(name,function,description) \
                { print("  ^2", name, "^7: ", description, "\n"); }
 
-       GENERIC_COMMANDS(0, 0, "")
+       GENERIC_COMMANDS(0, 0, "");
        #undef GENERIC_COMMAND
 
        return;
@@ -654,7 +654,7 @@ float GenericCommand_macro_command(float argc, string command)
        #define GENERIC_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command);
        #undef GENERIC_COMMAND
 
        return false;
@@ -665,7 +665,7 @@ float GenericCommand_macro_usage(float argc)
        #define GENERIC_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "");
        #undef GENERIC_COMMAND
 
        return false;
@@ -676,7 +676,7 @@ void GenericCommand_macro_write_aliases(float fh)
        #define GENERIC_COMMAND(name,function,description) \
                { CMD_Write_Alias("qc_cmd_svmenu", name, description); }
 
-       GENERIC_COMMANDS(0, 0, "")
+       GENERIC_COMMANDS(0, 0, "");
        #undef GENERIC_COMMAND
 
        return;

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index dbe01f40ff892f63ec955a244d00d65c63199fa2..9391c6bc7727ce040e65c79d2fcfdb63781b8c12 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -226,13 +226,14 @@ void Destroy_All_Notifications(void)
        entity notif;
        int i;
 
-       #define DESTROY_LOOP(type,count) \
+       #define DESTROY_LOOP(type,count) do { \
                for(i = 1; i <= count; ++i) \
                { \
                        notif = Get_Notif_Ent(type, i); \
                        if (!notif) { backtrace("Destroy_All_Notifications(): Missing notification entity!\n"); return; } \
                        Destroy_Notification_Entity(notif); \
-               }
+               } \
+       } while(0)
 
        // kill all networked notifications and centerprints
        #ifdef SVQC
@@ -242,11 +243,11 @@ void Destroy_All_Notifications(void)
        #endif
 
        // kill all real notification entities
-       DESTROY_LOOP(MSG_ANNCE, NOTIF_ANNCE_COUNT)
-       DESTROY_LOOP(MSG_INFO, NOTIF_INFO_COUNT)
-       DESTROY_LOOP(MSG_CENTER, NOTIF_CENTER_COUNT)
-       DESTROY_LOOP(MSG_MULTI, NOTIF_MULTI_COUNT)
-       DESTROY_LOOP(MSG_CHOICE, NOTIF_CHOICE_COUNT)
+       DESTROY_LOOP(MSG_ANNCE, NOTIF_ANNCE_COUNT);
+       DESTROY_LOOP(MSG_INFO, NOTIF_INFO_COUNT);
+       DESTROY_LOOP(MSG_CENTER, NOTIF_CENTER_COUNT);
+       DESTROY_LOOP(MSG_MULTI, NOTIF_MULTI_COUNT);
+       DESTROY_LOOP(MSG_CHOICE, NOTIF_CHOICE_COUNT);
        #undef DESTROY_LOOP
 }
 
@@ -722,7 +723,7 @@ void Create_Notification_Entity(
                                // ======================
                                //  Process Notif String
                                // ======================
-                               #define SET_NOTIF_STRING(string,stringname) \
+                               #define SET_NOTIF_STRING(string,stringname) do { \
                                        notif.nent_string = strzone(CCR( \
                                                Process_Notif_Line( \
                                                        typeId, \
@@ -732,15 +733,15 @@ void Create_Notification_Entity(
                                                        namestring, \
                                                        stringname \
                                                )) \
-                                       );
+                                       ); \
+                               } while(0)
 
                                if(GENTLE)
                                {
-                                       if(gentle != "") { SET_NOTIF_STRING(gentle, "GENTLE") }
-                                       else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL") }
+                                       if(gentle != "") { SET_NOTIF_STRING(gentle, "GENTLE"); }
+                                       else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL"); }
                                }
-                               else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL") }
-
+                               else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL"); }
                                #undef SET_NOTIF_STRING
 
                                // Check to make sure a string was chosen
@@ -1209,7 +1210,7 @@ string Local_Notification_sprintf(
        for(sel_num = 0;(args != "");)
        {
                selected = car(args); args = cdr(args);
-               NOTIF_HIT_MAX(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
+               NOTIF_HIT_MAX(NOTIF_MAX_ARGS, "Local_Notification_sprintf");
                switch(strtolower(selected))
                {
                        #ifdef CSQC
@@ -1324,7 +1325,7 @@ void Local_Notification_HUD_Notify_Push(
        for(sel_num = 0;(hudargs != "");)
        {
                selected = car(hudargs); hudargs = cdr(hudargs);
-               NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
+               NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push");
                switch(strtolower(selected))
                {
                        #define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { arg_slot[sel_num] = result; ++sel_num; break; }
@@ -1369,7 +1370,7 @@ void Local_Notification_centerprint_generic(
        for(sel_num = 0;(durcnt != "");)
        {
                selected = car(durcnt); durcnt = cdr(durcnt);
-               NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic")
+               NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic");
                switch(strtolower(selected))
                {
                        #define ARG_CASE_ARG_CS_SV_HA(selected,result)

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index e4e0ce7fa4fa2f796dfa8bdeadcc2b7567dd7331..cc529f84f9cc347c4f82be987f6b54e78a9180a5 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -1068,7 +1068,9 @@ const float ARG_DC = 6; // unique result to durcnt/centerprint
     ARG_CASE(ARG_SV,        "death_team",    Team_ColoredFullName(f1)) \
     ARG_CASE(ARG_CS,        "death_team",    Team_ColoredFullName(f1 - 1))
 
-#define NOTIF_HIT_MAX(count,funcname) if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; }
+#define NOTIF_HIT_MAX(count,funcname) do { \
+    if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; } \
+} while(0)
 #define NOTIF_HIT_UNKNOWN(token,funcname) { backtrace(sprintf("%s: Hit unknown token in selected string! '%s'\n", funcname, selected)); break; }
 
 #define KILL_SPREE_LIST \

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index 2537022f6ac55bba9cff6d12570e68ea0f12b3f9..3a41d094ff573e316993d592e7891b6ac247e60f 100644 (file)
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -36,9 +36,9 @@ void Dump_Weapon_Settings(void)
                        i,
                        WEP_NAME(i),
                        (((get_weaponinfo(i)).spawnflags & WEP_FLAG_MUTATORBLOCKED) ? " (MUTATOR WEAPON)" : "")
-               ))
-               for(x = 0; x <= WEP_CONFIG_COUNT; ++x) { WEP_CONFIG_WRITETOFILE(wep_config_queue[x]) }
-               WEP_CONFIG_WRITETOFILE("// }}}\n")
+               ));
+               for(x = 0; x <= WEP_CONFIG_COUNT; ++x) { WEP_CONFIG_WRITETOFILE(wep_config_queue[x]); }
+               WEP_CONFIG_WRITETOFILE("// }}}\n");
 
                // step 5: debug info
                print(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index efef821d89f79e5df742b0dea0d7fe9a1fd11fea..4412c0c6c8974f2ea83720b3247b88cabdc40e85 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -14,9 +14,10 @@ string wep_config_queue[MAX_WEP_CONFIG];
        wep_config_queue[WEP_CONFIG_COUNT] = a; \
        ++WEP_CONFIG_COUNT; }
 
-#define WEP_CONFIG_WRITETOFILE(a) { \
+#define WEP_CONFIG_WRITETOFILE(a) do { \
        fputs(wep_config_file, a); \
-       if(wep_config_alsoprint) { print(a); } }
+       if(wep_config_alsoprint) { print(a); } \
+} while(0)
 
 #define WEP_CONFIG_WRITE_CVARS_NONE(wepname,name) \
        { WEP_CONFIG_QUEUE( \

diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc
index 25cc17daad580faa024fa5ea98746fcc6abc1283..2b25afa4ef707e9844fa1bd008e6c67a02595a5d 100644 (file)
--- a/qcsrc/common/weapons/w_arc.qc
+++ b/qcsrc/common/weapons/w_arc.qc
@@ -732,7 +732,7 @@ float W_Arc(float req)
                                arc_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), false, false, 3);
                                arc_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), false, false, 4);
                        }
-                       ARC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       ARC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -746,7 +746,7 @@ float W_Arc(float req)
                }
                case WR_CONFIG:
                {
-                       ARC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       ARC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_KILLMESSAGE:

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 8b1b6ba984dc17bd278bcbad6a14f185ce5a051e..4fe6c156cdd5ce7bd22bcefaa169ec3f8d562ec0 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -230,7 +230,7 @@ float W_Blaster(float request)
                        precache_model("models/weapons/v_laser.md3");
                        precache_model("models/weapons/h_laser.iqm");
                        precache_sound("weapons/lasergun_fire.wav");
-                       BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                
@@ -248,7 +248,7 @@ float W_Blaster(float request)
                
                case WR_CONFIG:
                {
-                       BLASTER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       BLASTER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                

diff --git a/qcsrc/common/weapons/w_crylink.qc b/qcsrc/common/weapons/w_crylink.qc
index 70efdc0e24d3c2e385642dff4aea590109aa0119..0aa59b1d5e481ce9b15c56293c8d5bdd45322f3d 100644 (file)
--- a/qcsrc/common/weapons/w_crylink.qc
+++ b/qcsrc/common/weapons/w_crylink.qc
@@ -643,7 +643,7 @@ float W_Crylink(float req)
                        precache_sound("weapons/crylink_fire.wav");
                        precache_sound("weapons/crylink_fire2.wav");
                        precache_sound("weapons/crylink_linkjoin.wav");
-                       CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -668,7 +668,7 @@ float W_Crylink(float req)
                }
                case WR_CONFIG:
                {
-                       CRYLINK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       CRYLINK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_devastator.qc b/qcsrc/common/weapons/w_devastator.qc
index e49eb60ac9a725b9e894d6c466d7db9a19215033..8286ec1d3f7210bb5addf370e9ee55a9088ee67d 100644 (file)
--- a/qcsrc/common/weapons/w_devastator.qc
+++ b/qcsrc/common/weapons/w_devastator.qc
@@ -574,7 +574,7 @@ float W_Devastator(float req)
                                precache_sound("weapons/rocket_fire.wav");
                                precache_sound("weapons/rocket_mode.wav");
                        //}
-                       DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -624,7 +624,7 @@ float W_Devastator(float req)
                }
                case WR_CONFIG:
                {
-                       DEVASTATOR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       DEVASTATOR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc
index 2c0267d953adf922c67ee6a7d0887776c6c3b2e2..8e567efaf7b76a915099325e751e72149a20c7c4 100644 (file)
--- a/qcsrc/common/weapons/w_electro.qc
+++ b/qcsrc/common/weapons/w_electro.qc
@@ -505,7 +505,7 @@ float W_Electro(float req)
                        precache_sound("weapons/electro_fire2.wav");
                        precache_sound("weapons/electro_impact.wav");
                        precache_sound("weapons/electro_impact_combo.wav");
-                       ELECTRO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       ELECTRO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -530,7 +530,7 @@ float W_Electro(float req)
                }
                case WR_CONFIG:
                {
-                       ELECTRO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       ELECTRO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_fireball.qc b/qcsrc/common/weapons/w_fireball.qc
index 39d5832f1d70ea7323f66d2eb3860d4217b7b480..bdef5af5b51e45107a10b1bb847e85917ef87b81 100644 (file)
--- a/qcsrc/common/weapons/w_fireball.qc
+++ b/qcsrc/common/weapons/w_fireball.qc
@@ -405,7 +405,7 @@ float W_Fireball(float req)
                        precache_sound("weapons/fireball_fire.wav");
                        precache_sound("weapons/fireball_fire2.wav");
                        precache_sound("weapons/fireball_prefire2.wav");
-                       FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       FIREBALL_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -420,7 +420,7 @@ float W_Fireball(float req)
                }
                case WR_CONFIG:
                {
-                       FIREBALL_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       FIREBALL_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_hagar.qc b/qcsrc/common/weapons/w_hagar.qc
index 26bc5dbe08e1dad1544805ab23edc783fafcf8f9..4289efd7dfa2a6f95cb94799eed09745196a012f 100644 (file)
--- a/qcsrc/common/weapons/w_hagar.qc
+++ b/qcsrc/common/weapons/w_hagar.qc
@@ -451,7 +451,7 @@ float W_Hagar(float req)
                        precache_sound("weapons/hagar_fire.wav");
                        precache_sound("weapons/hagar_load.wav");
                        precache_sound("weapons/hagar_beep.wav");
-                       HAGAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       HAGAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -480,7 +480,7 @@ float W_Hagar(float req)
                }
                case WR_CONFIG:
                {
-                       HAGAR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       HAGAR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_hlac.qc b/qcsrc/common/weapons/w_hlac.qc
index 8fdefd32adcc0090ad19a1d22f59b6da90d8a3fd..c4e80a4a4fc51f014222b230fac94fade6945219 100644 (file)
--- a/qcsrc/common/weapons/w_hlac.qc
+++ b/qcsrc/common/weapons/w_hlac.qc
@@ -244,7 +244,7 @@ float W_HLAC(float req)
                        precache_model("models/weapons/v_hlac.md3");
                        precache_model("models/weapons/h_hlac.iqm");
                        precache_sound("weapons/lasergun_fire.wav");
-                       HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       HLAC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -261,7 +261,7 @@ float W_HLAC(float req)
                }
                case WR_CONFIG:
                {
-                       HLAC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       HLAC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_hmg.qc b/qcsrc/common/weapons/w_hmg.qc
index ac4ec39a35202d1d12dbfaa638b418a349142f71..ada439e8e56f6d976e5c5f40a5ad2e2af8ed0069 100644 (file)
--- a/qcsrc/common/weapons/w_hmg.qc
+++ b/qcsrc/common/weapons/w_hmg.qc
@@ -122,7 +122,7 @@ float W_HeavyMachineGun(float req)
                        precache_model ("models/weapons/v_ok_hmg.md3");
                        precache_model ("models/weapons/h_ok_hmg.iqm");
                        precache_sound ("weapons/uzi_fire.wav");
-                       HMG_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       HMG_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -145,7 +145,7 @@ float W_HeavyMachineGun(float req)
                }
                case WR_CONFIG:
                {
-                       HMG_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       HMG_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_hook.qc b/qcsrc/common/weapons/w_hook.qc
index 8ea84912aa58257abd2d003238c78d197b963b01..976c396b0d3bb3aa108bc25653570b62c29490e2 100644 (file)
--- a/qcsrc/common/weapons/w_hook.qc
+++ b/qcsrc/common/weapons/w_hook.qc
@@ -293,7 +293,7 @@ float W_Hook(float req)
                        precache_sound("weapons/hook_impact.wav"); // done by g_hook.qc
                        precache_sound("weapons/hook_fire.wav");
                        precache_sound("weapons/hookbomb_fire.wav");
-                       HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       HOOK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -315,7 +315,7 @@ float W_Hook(float req)
                }
                case WR_CONFIG:
                {
-                       HOOK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       HOOK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index 4494e3ed346955d49c883e21cd0cbce2a4349bb1..4ff30d69874c71daff0e2257b63822acadb7e6b5 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -308,7 +308,7 @@ float W_MachineGun(float req)
                        precache_model("models/weapons/v_uzi.md3");
                        precache_model("models/weapons/h_uzi.iqm");
                        precache_sound("weapons/uzi_fire.wav");
-                       MACHINEGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       MACHINEGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -345,7 +345,7 @@ float W_MachineGun(float req)
                }
                case WR_CONFIG:
                {
-                       MACHINEGUN_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       MACHINEGUN_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_minelayer.qc b/qcsrc/common/weapons/w_minelayer.qc
index b410898d552c13e92d86ae731e5967871012e9fe..790dbe047c80f2a5c393b4958ff850985e722ccc 100644 (file)
--- a/qcsrc/common/weapons/w_minelayer.qc
+++ b/qcsrc/common/weapons/w_minelayer.qc
@@ -542,7 +542,7 @@ float W_MineLayer(float req)
                        precache_sound("weapons/mine_fire.wav");
                        precache_sound("weapons/mine_stick.wav");
                        precache_sound("weapons/mine_trigger.wav");
-                       MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       MINELAYER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -565,7 +565,7 @@ float W_MineLayer(float req)
                }
                case WR_CONFIG:
                {
-                       MINELAYER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       MINELAYER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_mortar.qc b/qcsrc/common/weapons/w_mortar.qc
index 669ffbe7cb2c624cf0ae696dfbde263a7b0d22c5..3b1dde49e8c3dce85077a8d1f1b6f03e58615264 100644 (file)
--- a/qcsrc/common/weapons/w_mortar.qc
+++ b/qcsrc/common/weapons/w_mortar.qc
@@ -415,7 +415,7 @@ float W_Mortar(float req)
                        precache_sound("weapons/grenade_bounce6.wav");
                        precache_sound("weapons/grenade_stick.wav");
                        precache_sound("weapons/grenade_fire.wav");
-                       MORTAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       MORTAR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -432,7 +432,7 @@ float W_Mortar(float req)
                }
                case WR_CONFIG:
                {
-                       MORTAR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       MORTAR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_porto.qc b/qcsrc/common/weapons/w_porto.qc
index 7011d80de2dca3ef0fbb2965972b2590e16202b3..a5c95aa403e6c8f86b3b073d6c2efdb615a49ca0 100644 (file)
--- a/qcsrc/common/weapons/w_porto.qc
+++ b/qcsrc/common/weapons/w_porto.qc
@@ -305,7 +305,7 @@ float W_Porto(float req)
                }
                case WR_CONFIG:
                {
-                       PORTO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       PORTO_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_THINK:
@@ -378,7 +378,7 @@ float W_Porto(float req)
                        precache_sound("porto/explode.wav");
                        precache_sound("porto/fire.wav");
                        precache_sound("porto/unsupported.wav");
-                       PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       PORTO_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:

diff --git a/qcsrc/common/weapons/w_rifle.qc b/qcsrc/common/weapons/w_rifle.qc
index 0424b16dda3af0c5c0cc5fc41935efd3973da1d0..aa3c74af926a15510c87f4f812f70a71a779087f 100644 (file)
--- a/qcsrc/common/weapons/w_rifle.qc
+++ b/qcsrc/common/weapons/w_rifle.qc
@@ -208,7 +208,7 @@ float W_Rifle(float req)
                        precache_model("models/weapons/h_campingrifle.iqm");
                        precache_sound("weapons/campingrifle_fire.wav");
                        precache_sound("weapons/campingrifle_fire2.wav");
-                       RIFLE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       RIFLE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -225,7 +225,7 @@ float W_Rifle(float req)
                }
                case WR_CONFIG:
                {
-                       RIFLE_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       RIFLE_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_rpc.qc b/qcsrc/common/weapons/w_rpc.qc
index 9cba90f6841ec446685fda35e42cfeffbad194e5..b073a31704e8ab51dc93788cc5b94578d01ac4b9 100644 (file)
--- a/qcsrc/common/weapons/w_rpc.qc
+++ b/qcsrc/common/weapons/w_rpc.qc
@@ -186,7 +186,7 @@ float W_RocketPropelledChainsaw(float req)
                        precache_model("models/weapons/v_ok_rl.md3");
                        precache_model("models/weapons/g_ok_rl.md3");
                        precache_sound ("weapons/rocket_fire.wav");
-                       RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       RPC_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -201,7 +201,7 @@ float W_RocketPropelledChainsaw(float req)
                }
                case WR_CONFIG:
                {
-                       RPC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       RPC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_seeker.qc b/qcsrc/common/weapons/w_seeker.qc
index 8af147f29e027c499ef4f0904564759f160e60d7..45a121ab40bef47b03a42f32090dcf3b6fed3c84 100644 (file)
--- a/qcsrc/common/weapons/w_seeker.qc
+++ b/qcsrc/common/weapons/w_seeker.qc
@@ -668,7 +668,7 @@ float W_Seeker(float req)
                        precache_sound("weapons/tag_fire.wav");
                        precache_sound("weapons/flac_fire.wav");
                        precache_sound("weapons/seeker_fire.wav");
-                       SEEKER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       SEEKER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -701,7 +701,7 @@ float W_Seeker(float req)
                }
                case WR_CONFIG:
                {
-                       SEEKER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       SEEKER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index e6653f7fa62583bce4e4dc757283a27d461fb726..7311c6e00d3d220e66dc950917c2fde56f40c4bc 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -716,7 +716,7 @@ float W_Shockwave(float req)
                        precache_sound("misc/itempickup.wav");
                        precache_sound("weapons/lasergun_fire.wav");
                        precache_sound("weapons/shotgun_melee.wav");
-                       SHOCKWAVE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       SHOCKWAVE_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -727,7 +727,7 @@ float W_Shockwave(float req)
                }
                case WR_CONFIG:
                {
-                       SHOCKWAVE_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       SHOCKWAVE_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_SUICIDEMESSAGE:

diff --git a/qcsrc/common/weapons/w_shotgun.qc b/qcsrc/common/weapons/w_shotgun.qc
index 67b3d26521f8781a051637ff472946d330a8ef01..7f54543cdf9a83f10b5176acca439ccfe9c69c18 100644 (file)
--- a/qcsrc/common/weapons/w_shotgun.qc
+++ b/qcsrc/common/weapons/w_shotgun.qc
@@ -292,7 +292,7 @@ float W_Shotgun(float req)
                        precache_sound("misc/itempickup.wav");
                        precache_sound("weapons/shotgun_fire.wav");
                        precache_sound("weapons/shotgun_melee.wav");
-                       SHOTGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       SHOTGUN_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -325,7 +325,7 @@ float W_Shotgun(float req)
                }
                case WR_CONFIG:
                {
-                       SHOTGUN_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       SHOTGUN_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index 6806bf133bafa8cb7864d745923615191ceeb52c..54959949a746024e406f5567b3355a103e3cb75b 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -423,7 +423,7 @@ float W_Tuba(float req)
                        precache_model("models/weapons/h_akordeon.iqm");
                        precache_model("models/weapons/v_kleinbottle.md3");
                        precache_model("models/weapons/h_kleinbottle.iqm");
-                       TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       TUBA_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -467,7 +467,7 @@ float W_Tuba(float req)
                }
                case WR_CONFIG:
                {
-                       TUBA_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       TUBA_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_SUICIDEMESSAGE:

diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc
index 9472e80116258f5c89b71deb0fac94d32a034590..869c8ec7c03780806002b71ff4733bb9f43c49d9 100644 (file)
--- a/qcsrc/common/weapons/w_vaporizer.qc
+++ b/qcsrc/common/weapons/w_vaporizer.qc
@@ -195,7 +195,7 @@ float W_Vaporizer(float req)
                        precache_sound("weapons/nexwhoosh2.wav");
                        precache_sound("weapons/nexwhoosh3.wav");
                        //W_Blaster(WR_INIT); // Samual: Is this really the proper thing to do? Didn't we already run this previously?
-                       VAPORIZER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       VAPORIZER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_SETUP:
@@ -220,7 +220,7 @@ float W_Vaporizer(float req)
                }
                case WR_CONFIG:
                {
-                       VAPORIZER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       VAPORIZER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RESETPLAYER:

diff --git a/qcsrc/common/weapons/w_vortex.qc b/qcsrc/common/weapons/w_vortex.qc
index 2ab35a47bc98c44b7327e5a2ff1e0812df7471bf..f421786d80fa72fae55d20024e48c88787d87236 100644 (file)
--- a/qcsrc/common/weapons/w_vortex.qc
+++ b/qcsrc/common/weapons/w_vortex.qc
@@ -251,7 +251,7 @@ float W_Vortex(float req)
                        precache_sound("weapons/nexwhoosh1.wav");
                        precache_sound("weapons/nexwhoosh2.wav");
                        precache_sound("weapons/nexwhoosh3.wav");
-                       VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
+                       VORTEX_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP);
                        return true;
                }
                case WR_CHECKAMMO1:
@@ -276,7 +276,7 @@ float W_Vortex(float req)
                }
                case WR_CONFIG:
                {
-                       VORTEX_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
+                       VORTEX_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS);
                        return true;
                }
                case WR_RELOAD:

diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc
index 2838a2c29dd80155cb5fb2726998c77a929ca494..aaf8f5ef61c6d715a1ab66cfbd1ca2a78bbad1c6 100644 (file)
--- a/qcsrc/server/command/banning.qc
+++ b/qcsrc/server/command/banning.qc
@@ -273,7 +273,7 @@ void BanCommand_macro_help()
        #define BAN_COMMAND(name,function,description) \
                { if(strtolower(description) != "") { print("  ^2", name, "^7: ", description, "\n"); } }
 
-       BAN_COMMANDS(0, 0, "")
+       BAN_COMMANDS(0, 0, "");
        #undef BAN_COMMAND
 
        return;
@@ -284,7 +284,7 @@ float BanCommand_macro_command(float argc, string command)
        #define BAN_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       BAN_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       BAN_COMMANDS(CMD_REQUEST_COMMAND, argc, command);
        #undef BAN_COMMAND
 
        return false;
@@ -295,7 +295,7 @@ float BanCommand_macro_usage(float argc)
        #define BAN_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       BAN_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       BAN_COMMANDS(CMD_REQUEST_USAGE, argc, "");
        #undef BAN_COMMAND
 
        return false;
@@ -306,7 +306,7 @@ void BanCommand_macro_write_aliases(float fh)
        #define BAN_COMMAND(name,function,description) \
                { if(strtolower(description) != "") { CMD_Write_Alias("qc_cmd_sv", name, description); } }
 
-       BAN_COMMANDS(0, 0, "")
+       BAN_COMMANDS(0, 0, "");
        #undef BAN_COMMAND
 
        return;

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 64ab85753990f2b45546fb06c5d67880dcfc1dd8..29f46c9cd1a803a8470264ac92108b454d5c12fb 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -750,7 +750,7 @@ void ClientCommand_macro_help()
        #define CLIENT_COMMAND(name,function,description) \
                { sprint(self, "  ^2", name, "^7: ", description, "\n"); }
 
-       CLIENT_COMMANDS(0, 0, "")
+       CLIENT_COMMANDS(0, 0, "");
        #undef CLIENT_COMMAND
 
        return;
@@ -761,7 +761,7 @@ float ClientCommand_macro_command(float argc, string command)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc, command);
        #undef CLIENT_COMMAND
 
        return false;
@@ -772,7 +772,7 @@ float ClientCommand_macro_usage(float argc)
        #define CLIENT_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc, "");
        #undef CLIENT_COMMAND
 
        return false;
@@ -783,7 +783,7 @@ void ClientCommand_macro_write_aliases(float fh)
        #define CLIENT_COMMAND(name,function,description) \
                { CMD_Write_Alias("qc_cmd_cmd", name, description); }
 
-       CLIENT_COMMANDS(0, 0, "")
+       CLIENT_COMMANDS(0, 0, "");
        #undef CLIENT_COMMAND
 
        return;

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index 60ac9917ad88150e1533e039e721ae0417c60c1e..323d232c799717f79654caaeaca8eedd03b57fc8 100644 (file)
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -689,7 +689,7 @@ void CommonCommand_macro_help(entity caller)
        #define COMMON_COMMAND(name,function,description) \
                { print_to(caller, strcat("  ^2", name, "^7: ", description)); }
 
-       COMMON_COMMANDS(0, caller, 0, "")
+       COMMON_COMMANDS(0, caller, 0, "");
        #undef COMMON_COMMAND
 
        return;
@@ -700,7 +700,7 @@ float CommonCommand_macro_command(float argc, entity caller, string command)
        #define COMMON_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       COMMON_COMMANDS(CMD_REQUEST_COMMAND, caller, argc, command)
+       COMMON_COMMANDS(CMD_REQUEST_COMMAND, caller, argc, command);
        #undef COMMON_COMMAND
 
        return false;
@@ -711,7 +711,7 @@ float CommonCommand_macro_usage(float argc, entity caller)
        #define COMMON_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       COMMON_COMMANDS(CMD_REQUEST_USAGE, caller, argc, "")
+       COMMON_COMMANDS(CMD_REQUEST_USAGE, caller, argc, "");
        #undef COMMON_COMMAND
 
        return false;
@@ -722,7 +722,7 @@ void CommonCommand_macro_write_aliases(float fh)
        #define COMMON_COMMAND(name,function,description) \
                { CMD_Write_Alias("qc_cmd_svcmd", name, description); }
 
-       COMMON_COMMANDS(0, world, 0, "")
+       COMMON_COMMANDS(0, world, 0, "");
        #undef COMMON_COMMAND
 
        return;

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index c925b3894871fa078ddd13daa77aa43bf9c7a552..63485d59c69a88081932cbbee6d5eb546010c289 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -1815,7 +1815,7 @@ void GameCommand_macro_help()
        #define SERVER_COMMAND(name,function,description) \
                { print("  ^2", name, "^7: ", description, "\n"); }
 
-       SERVER_COMMANDS(0, 0, "")
+       SERVER_COMMANDS(0, 0, "");
        #undef SERVER_COMMAND
 
        return;
@@ -1826,7 +1826,7 @@ float GameCommand_macro_command(float argc, string command)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(0))) { function; return true; } }
 
-       SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       SERVER_COMMANDS(CMD_REQUEST_COMMAND, argc, command);
        #undef SERVER_COMMAND
 
        return false;
@@ -1837,7 +1837,7 @@ float GameCommand_macro_usage(float argc)
        #define SERVER_COMMAND(name,function,description) \
                { if(name == strtolower(argv(1))) { function; return true; } }
 
-       SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       SERVER_COMMANDS(CMD_REQUEST_USAGE, argc, "");
        #undef SERVER_COMMAND
 
        return false;
@@ -1848,7 +1848,7 @@ void GameCommand_macro_write_aliases(float fh)
        #define SERVER_COMMAND(name,function,description) \
                { CMD_Write_Alias("qc_cmd_sv", name, description); }
 
-       SERVER_COMMANDS(0, 0, "")
+       SERVER_COMMANDS(0, 0, "");
        #undef SERVER_COMMAND
 
        return;

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 7d9517d54ff679eea7e00cdb8b98c2606fc08682..79925fc4e58070dbe09837256ba2b45bea554808 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -1088,7 +1088,7 @@ void VoteCommand_macro_help(entity caller, float argc)
                #define VOTE_COMMAND(name,function,description,assignment) \
                        { if(Votecommand_check_assignment(caller, assignment)) { print_to(caller, strcat("  ^2", name, "^7: ", description)); } }
 
-               VOTE_COMMANDS(0, caller, 0, "")
+               VOTE_COMMANDS(0, caller, 0, "");
                #undef VOTE_COMMAND
 
                print_to(caller, strcat("\nUsage:^3 ", command_origin, " vote COMMAND...^7, where possible commands are listed above.\n"));
@@ -1100,7 +1100,7 @@ void VoteCommand_macro_help(entity caller, float argc)
                #define VOTE_COMMAND(name,function,description,assignment) \
                        { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(2))) { function; return; } } }
 
-               VOTE_COMMANDS(CMD_REQUEST_USAGE, caller, argc, "")
+               VOTE_COMMANDS(CMD_REQUEST_USAGE, caller, argc, "");
                #undef VOTE_COMMAND
        }
 
@@ -1112,7 +1112,7 @@ float VoteCommand_macro_command(entity caller, float argc, string vote_command)
        #define VOTE_COMMAND(name,function,description,assignment) \
                { if(Votecommand_check_assignment(caller, assignment)) { if(name == strtolower(argv(1))) { function; return true; } } }
 
-       VOTE_COMMANDS(CMD_REQUEST_COMMAND, caller, argc, vote_command)
+       VOTE_COMMANDS(CMD_REQUEST_COMMAND, caller, argc, vote_command);
        #undef VOTE_COMMAND
 
        return false;