Unify boolean constants
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 25 Jan 2015 23:48:07 +0000 (10:48 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 25 Jan 2015 23:48:09 +0000 (10:48 +1100)
TRUE -> true
FALSE -> false

239 files changed:
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/announcer.qc
qcsrc/client/autocvars.qh
qcsrc/client/bgmscript.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/csqc_constants.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/damage.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/movetypes.qc
qcsrc/client/prandom.qc
qcsrc/client/scoreboard.qc
qcsrc/client/shownames.qc
qcsrc/client/teamradar.qc
qcsrc/client/tturrets.qc
qcsrc/client/tuba.qc
qcsrc/client/vehicles/vehicles.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/command/generic.qc
qcsrc/common/command/rpn.qc
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/monster/zombie.qc
qcsrc/common/monsters/spawn.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/nades.qc
qcsrc/common/net_notice.qc
qcsrc/common/notifications.qc
qcsrc/common/notifications.qh
qcsrc/common/playerstats.qc
qcsrc/common/test.qc
qcsrc/common/util-pre.qh
qcsrc/common/util.qc
qcsrc/common/weapons/w_arc.qc
qcsrc/common/weapons/w_blaster.qc
qcsrc/common/weapons/w_crylink.qc
qcsrc/common/weapons/w_devastator.qc
qcsrc/common/weapons/w_electro.qc
qcsrc/common/weapons/w_fireball.qc
qcsrc/common/weapons/w_hagar.qc
qcsrc/common/weapons/w_hlac.qc
qcsrc/common/weapons/w_hmg.qc
qcsrc/common/weapons/w_hook.qc
qcsrc/common/weapons/w_machinegun.qc
qcsrc/common/weapons/w_minelayer.qc
qcsrc/common/weapons/w_mortar.qc
qcsrc/common/weapons/w_porto.qc
qcsrc/common/weapons/w_rifle.qc
qcsrc/common/weapons/w_rpc.qc
qcsrc/common/weapons/w_seeker.qc
qcsrc/common/weapons/w_shockwave.qc
qcsrc/common/weapons/w_shotgun.qc
qcsrc/common/weapons/w_tuba.qc
qcsrc/common/weapons/w_vaporizer.qc
qcsrc/common/weapons/w_vortex.qc
qcsrc/csqcmodellib/cl_model.qc
qcsrc/csqcmodellib/cl_player.qc
qcsrc/csqcmodellib/sv_model.qc
qcsrc/dpdefs/dpextensions.qc
qcsrc/dpdefs/progsdefs.qc
qcsrc/menu/anim/animation.qc
qcsrc/menu/draw.qc
qcsrc/menu/item/dialog.qc
qcsrc/menu/menu.qc
qcsrc/menu/xonotic/campaign.qc
qcsrc/menu/xonotic/demolist.qc
qcsrc/menu/xonotic/dialog_hudpanel_ammo.qc
qcsrc/menu/xonotic/dialog_hudpanel_buffs.qc
qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qc
qcsrc/menu/xonotic/dialog_hudpanel_chat.qc
qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qc
qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qc
qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qc
qcsrc/menu/xonotic/dialog_hudpanel_modicons.qc
qcsrc/menu/xonotic/dialog_hudpanel_notification.qc
qcsrc/menu/xonotic/dialog_hudpanel_physics.qc
qcsrc/menu/xonotic/dialog_hudpanel_powerups.qc
qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qc
qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qc
qcsrc/menu/xonotic/dialog_hudpanel_radar.qc
qcsrc/menu/xonotic/dialog_hudpanel_score.qc
qcsrc/menu/xonotic/dialog_hudpanel_timer.qc
qcsrc/menu/xonotic/dialog_hudpanel_vote.qc
qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc
qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
qcsrc/menu/xonotic/dialog_multiplayer_create.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc
qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
qcsrc/menu/xonotic/dialog_sandboxtools.qc
qcsrc/menu/xonotic/dialog_settings_audio.qc
qcsrc/menu/xonotic/dialog_settings_effects.qc
qcsrc/menu/xonotic/dialog_settings_game_messages.qc
qcsrc/menu/xonotic/dialog_settings_input.qc
qcsrc/menu/xonotic/dialog_teamselect.qc
qcsrc/menu/xonotic/gametypelist.qc
qcsrc/menu/xonotic/languagelist.qc
qcsrc/menu/xonotic/playermodel.qc
qcsrc/menu/xonotic/playlist.qc
qcsrc/menu/xonotic/screenshotimage.qc
qcsrc/menu/xonotic/screenshotlist.qc
qcsrc/menu/xonotic/serverlist.qc
qcsrc/menu/xonotic/skinlist.qc
qcsrc/menu/xonotic/slider_resolution.qc
qcsrc/menu/xonotic/soundlist.qc
qcsrc/menu/xonotic/statslist.qc
qcsrc/menu/xonotic/textlabel.qc
qcsrc/menu/xonotic/util.qc
qcsrc/menu/xonotic/weaponarenacheckbox.qc
qcsrc/menu/xonotic/weaponslist.qc
qcsrc/server/antilag.qc
qcsrc/server/bot/aim.qc
qcsrc/server/bot/bot.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/role_onslaught.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/bot/navigation.qc
qcsrc/server/bot/scripting.qc
qcsrc/server/bot/waypoints.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/banning.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/common.qc
qcsrc/server/command/getreplies.qc
qcsrc/server/command/radarmap.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/ent_cs.qc
qcsrc/server/func_breakable.qc
qcsrc/server/g_casings.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_hook.qc
qcsrc/server/g_models.qc
qcsrc/server/g_subs.qc
qcsrc/server/g_tetris.qc
qcsrc/server/g_triggers.qc
qcsrc/server/g_violence.qc
qcsrc/server/g_world.qc
qcsrc/server/ipban.qc
qcsrc/server/item_key.qc
qcsrc/server/item_key.qh
qcsrc/server/mapvoting.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_assault.qc
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_ctf.qh
qcsrc/server/mutators/gamemode_cts.qc
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/mutators/gamemode_invasion.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/mutators/gamemode_lms.qc
qcsrc/server/mutators/gamemode_nexball.qc
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_race.qc
qcsrc/server/mutators/gamemode_tdm.qc
qcsrc/server/mutators/mutator_bloodloss.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_campcheck.qc
qcsrc/server/mutators/mutator_dodging.qc
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/server/mutators/mutator_melee_only.qc
qcsrc/server/mutators/mutator_midair.qc
qcsrc/server/mutators/mutator_multijump.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_new_toys.qc
qcsrc/server/mutators/mutator_nix.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/server/mutators/mutator_physical_items.qc
qcsrc/server/mutators/mutator_pinata.qc
qcsrc/server/mutators/mutator_random_gravity.qc
qcsrc/server/mutators/mutator_superspec.qc
qcsrc/server/mutators/mutator_touchexplode.qc
qcsrc/server/mutators/mutator_vampire.qc
qcsrc/server/mutators/sandbox.qc
qcsrc/server/pathlib.qc
qcsrc/server/pathlib/main.qc
qcsrc/server/pathlib/path_waypoint.qc
qcsrc/server/pathlib/utility.qc
qcsrc/server/portals.qc
qcsrc/server/race.qc
qcsrc/server/round_handler.qc
qcsrc/server/round_handler.qh
qcsrc/server/scores.qc
qcsrc/server/scores_rules.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/sv_main.qc
qcsrc/server/t_items.qc
qcsrc/server/t_jumppads.qc
qcsrc/server/t_plats.qc
qcsrc/server/t_teleporters.qc
qcsrc/server/target_music.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/system/system_main.qc
qcsrc/server/tturrets/system/system_misc.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_flac.qc
qcsrc/server/tturrets/units/unit_hellion.qc
qcsrc/server/tturrets/units/unit_hk.qc
qcsrc/server/tturrets/units/unit_mlrs.qc
qcsrc/server/tturrets/units/unit_phaser.qc
qcsrc/server/tturrets/units/unit_plasma.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/bumblebee.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/vehicles.qc
qcsrc/server/waypointsprites.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/common.qc
qcsrc/server/weapons/selection.qc
qcsrc/server/weapons/selection.qh
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/tracing.qc
qcsrc/server/weapons/tracing.qh
qcsrc/server/weapons/weaponstats.qc
qcsrc/server/weapons/weaponsystem.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/server.qc
qcsrc/warpzonelib/util_server.qc

index 2ce4e92..4ba741d 100644 (file)
@@ -47,7 +47,7 @@ void CSQC_Init(void)
        compressShortVector_init();
 
        draw_endBoldFont();
-       menu_visible = FALSE;
+       menu_visible = false;
        menu_show = menu_show_error;
        menu_action = func_null;
 
@@ -219,7 +219,7 @@ float SetTeam(entity o, float Team)
                        tm = GetTeam(o.team, false);
                        tm.team_size -= 1;
                        o.has_team = 0;
-                       return TRUE;
+                       return true;
                }
        }
        else
@@ -230,7 +230,7 @@ float SetTeam(entity o, float Team)
                        tm = GetTeam(Team, true);
                        tm.team_size += 1;
                        o.has_team = 1;
-                       return TRUE;
+                       return true;
                }
                else if(Team != o.team)
                {
@@ -239,10 +239,10 @@ float SetTeam(entity o, float Team)
                        o.team = Team;
                        tm = GetTeam(Team, true);
                        tm.team_size += 1;
-                       return TRUE;
+                       return true;
                }
        }
-       return FALSE;
+       return false;
 }
 
 void Playerchecker_Think()
@@ -321,7 +321,7 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 
        if(menu_visible && menu_action)
                if(menu_action(bInputType, nPrimary, nSecondary))
-                       return TRUE;
+                       return true;
 
        return bSkipKey;
 }
@@ -729,7 +729,7 @@ void Ent_ReadSpawnEvent(float is_new)
                if(autocvar_cl_unpress_zoom_on_spawn)
                {
                        localcmd("-zoom\n");
-                       button_zoom = FALSE;
+                       button_zoom = false;
                }
        }
 
index b87cef4..70c9ae6 100644 (file)
@@ -34,7 +34,7 @@ void Porto_Draw()
        for(0;;)
        {
                dir = nextdir;
-               traceline(p, p + 65536 * dir, TRUE, porto);
+               traceline(p, p + 65536 * dir, true, porto);
                if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
                        return;
                nextdir = dir - 2 * (dir * trace_plane_normal) * trace_plane_normal; // mirror dir at trace_plane_normal
@@ -394,25 +394,25 @@ float eventchase_running;
 float WantEventchase()
 {
        if(autocvar_cl_orthoview)
-               return FALSE;
+               return false;
        if(intermission)
-               return TRUE;
+               return true;
        if(spectatee_status >= 0)
        {
                if(autocvar_cl_eventchase_nexball && gametype == MAPINFO_TYPE_NEXBALL && !(WepSet_GetFromStat() & WepSet_FromWeapon(WEP_PORTO)))
-                       return TRUE;
+                       return true;
                if(autocvar_cl_eventchase_death && (getstati(STAT_HEALTH) <= 0))
                {
                        if(autocvar_cl_eventchase_death == 2)
                        {
                                // don't stop eventchase once it's started (even if velocity changes afterwards)
                                if(self.velocity == '0 0 0' || eventchase_running)
-                                       return TRUE;
+                                       return true;
                        }
-                       else return TRUE;
+                       else return true;
                }
        }
-       return FALSE;
+       return false;
 }
 
 vector damage_blurpostprocess, content_blurpostprocess;
@@ -867,7 +867,7 @@ void UpdateCrosshair()
                                        f = (time - wcross_name_changestarttime) / autocvar_crosshair_effect_time;
                                        if (f >= 1)
                                        {
-                                               wcross_ring_prev = ((ring_image) ? TRUE : FALSE);
+                                               wcross_ring_prev = ((ring_image) ? true : false);
                                        }
 
                                        if(wcross_ring_prev)
@@ -1045,7 +1045,7 @@ void CSQC_UpdateView(float w, float h)
        {
                // no zoom while dead or in intermission please
                localcmd("-zoom\n");
-               button_zoom = FALSE;
+               button_zoom = false;
        }
 
        // event chase camera
@@ -1053,7 +1053,7 @@ void CSQC_UpdateView(float w, float h)
        {
                if(WantEventchase())
                {
-                       eventchase_running = TRUE;
+                       eventchase_running = true;
 
                        // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.)
                        vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org);
@@ -1095,7 +1095,7 @@ void CSQC_UpdateView(float w, float h)
                }
                else if(autocvar_chase_active < 0) // time to disable chase_active if it was set by this code
                {
-                       eventchase_running = FALSE;
+                       eventchase_running = false;
                        cvar_set("chase_active", "0");
                        eventchase_current_distance = 0; // start from 0 next time
                }
@@ -1273,13 +1273,13 @@ void CSQC_UpdateView(float w, float h)
                if(button_zoom && autocvar_cl_unpress_zoom_on_weapon_switch)
                {
                        localcmd("-zoom\n");
-                       button_zoom = FALSE;
+                       button_zoom = false;
                }
                if(autocvar_cl_unpress_attack_on_weapon_switch)
                {
                        localcmd("-fire\n");
                        localcmd("-fire2\n");
-                       button_attack2 = FALSE;
+                       button_attack2 = false;
                }
        }
        if(last_activeweapon != activeweapon)
@@ -1324,7 +1324,7 @@ void CSQC_UpdateView(float w, float h)
                {
                        cvar_set("chase_active", ftos(chase_active_backup));
                        cvar_set("cl_demo_mousegrab", "0");
-                       camera_active = FALSE;
+                       camera_active = false;
                }
        }
 #ifdef CAMERATEST
@@ -1337,8 +1337,8 @@ void CSQC_UpdateView(float w, float h)
                chase_active_backup = autocvar_chase_active;
                cvar_set("chase_active", "2");
                cvar_set("cl_demo_mousegrab", "1");
-               camera_active = TRUE;
-               camera_mode = FALSE;
+               camera_active = true;
+               camera_mode = false;
        }
 
        // Draw the Crosshair
index e4fb87d..9f74dac 100644 (file)
@@ -13,7 +13,7 @@ void Announcer_Countdown()
        if(roundstarttime >= starttime)
                starttime = roundstarttime;
        if(starttime <= time && roundstarttime != starttime) // game start time has passed
-               announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well
+               announcer_5min = announcer_1min = false; // reset maptime announcers now as well
 
        float countdown = (starttime - time);
        float countdown_rounded = floor(0.5 + countdown);
@@ -101,7 +101,7 @@ void Announcer_Time()
                {
                        if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 300)
                                || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 300))
-                                       announcer_5min = FALSE;
+                                       announcer_5min = false;
                }
                else
                {
@@ -111,7 +111,7 @@ void Announcer_Time()
                                //if we're in warmup mode, check whether there's a warmup timelimit
                                if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
                                {
-                                       announcer_5min = TRUE;
+                                       announcer_5min = true;
                                        Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
                                }
                        }
@@ -125,7 +125,7 @@ void Announcer_Time()
                {
                        if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 60)
                                || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 60))
-                                       announcer_1min = FALSE;
+                                       announcer_1min = false;
                }
                else if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 60)
                        || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 60))
@@ -133,7 +133,7 @@ void Announcer_Time()
                        // if we're in warmup mode, check whether there's a warmup timelimit
                        if(!(autocvar_g_warmup_limit == -1 && warmup_stage))
                        {
-                               announcer_1min = TRUE;
+                               announcer_1min = true;
                                Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);
                        }
                }
index 9eccb08..38178e2 100644 (file)
@@ -176,9 +176,9 @@ float autocvar_g_waypointsprite_normdistance;
 float autocvar_g_waypointsprite_scale;
 int autocvar_g_waypointsprite_spam;
 float autocvar_g_waypointsprite_timealphaexponent;
-var bool autocvar_g_waypointsprite_turrets = TRUE;
+var bool autocvar_g_waypointsprite_turrets = true;
 var float autocvar_g_waypointsprite_turrets_maxdist = 5000;
-var bool autocvar_hud_cursormode = TRUE;
+var bool autocvar_hud_cursormode = true;
 float autocvar_hud_colorflash_alpha;
 bool autocvar_hud_configure_checkcollisions;
 bool autocvar_hud_configure_grid;
index 800e899..716696f 100644 (file)
@@ -176,7 +176,7 @@ float BGMScript(entity e)
        if(autocvar_bgmvolume <= 0)
                return -1;
 
-       e.just_toggled = FALSE;
+       e.just_toggled = false;
 
        if(bgmtime < 0)
                return -1;
@@ -189,7 +189,7 @@ float BGMScript(entity e)
                e.bgmscripttime = bgmtime;
 
                // treat this as a stop event for all notes, to prevent sticking keys
-               e.bgmscriptstate = FALSE;
+               e.bgmscriptstate = false;
                e.bgmscriptvolume = 1;
                e.bgmscriptstatetime = bgmtime - GetTimeForAmplitude(e, amp);
        }
@@ -214,11 +214,11 @@ float BGMScript(entity e)
                        vel = stof(argv(2));
                        if(vel > 0)
                        {
-                               e.just_toggled = e.bgmscriptstate = TRUE;
+                               e.just_toggled = e.bgmscriptstate = true;
                                e.bgmscriptvolume = vel;
                        }
                        else
-                               e.just_toggled = e.bgmscriptstate = FALSE;
+                               e.just_toggled = e.bgmscriptstate = false;
 
                        e.bgmscriptstatetime = e.bgmscripttime - GetTimeForAmplitude(e, amp);
                }
index dbece27..e8f3600 100644 (file)
@@ -425,23 +425,23 @@ void LocalCommand_macro_help()
 bool LocalCommand_macro_command(int argc)
 {
        #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               { if(name == strtolower(argv(0))) { function; return true; } }
 
        CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc)
        #undef CLIENT_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 bool LocalCommand_macro_usage(int argc)
 {
        #define CLIENT_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               { if(name == strtolower(argv(1))) { function; return true; } }
 
        CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc)
        #undef CLIENT_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 void LocalCommand_macro_write_aliases(int fh)
@@ -517,10 +517,10 @@ 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 \
-       CONSOLE_COMMAND("+showscores", { scoreboard_showscores = TRUE; }) \
-       CONSOLE_COMMAND("-showscores", { scoreboard_showscores = FALSE; }) \
-       CONSOLE_COMMAND("+showaccuracy", { scoreboard_showaccuracy = TRUE; }) \
-       CONSOLE_COMMAND("-showaccuracy", { scoreboard_showaccuracy = FALSE; }) \
+       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 \
@@ -571,12 +571,12 @@ void ConsoleCommand_macro_init()
 bool ConsoleCommand_macro_normal(int argc)
 {
        #define CONSOLE_COMMAND(name,execution) \
-               { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+               { if(name == strtolower(argv(0))) { { execution } return true; } }
 
        CONSOLE_COMMANDS_NORMAL
        #undef CONSOLE_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 bool ConsoleCommand_macro_movement(int argc)
@@ -584,13 +584,13 @@ bool ConsoleCommand_macro_movement(int argc)
        if(camera_active)
        {
                #define CONSOLE_COMMAND(name,execution) \
-                       { if(name == strtolower(argv(0))) { { execution } return TRUE; } }
+                       { if(name == strtolower(argv(0))) { { execution } return true; } }
 
                CONSOLE_COMMANDS_MOVEMENT
                #undef CONSOLE_COMMAND
        }
 
-       return FALSE;
+       return false;
 }
 
 
@@ -605,14 +605,14 @@ bool CSQC_ConsoleCommand(string command)
 
        if(ConsoleCommand_macro_normal(argc))
        {
-               return TRUE;
+               return true;
        }
        else if(ConsoleCommand_macro_movement(argc))
        {
-               return TRUE;
+               return true;
        }
 
        // Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it.
 
-       return FALSE;
+       return false;
 }
index b568947..2cd6dc4 100644 (file)
@@ -128,8 +128,8 @@ const int SOLID_SLIDEBOX    = 3; // touch on edge, but not an onground
 const int SOLID_BSP            = 4; // bsp clip, touch on edge, block
 const int SOLID_CORPSE         = 5; // same as SOLID_BBOX, except it behaves as SOLID_NOT against SOLID_SLIDEBOX objects (players/monsters)
 
-const int MOVE_NORMAL = 0; // same as FALSE
-const int MOVE_NOMONSTERS = 1; // same as TRUE
+const int MOVE_NORMAL = 0; // same as false
+const int MOVE_NOMONSTERS = 1; // same as true
 const int MOVE_MISSILE = 2; // save as movement with .movetype == MOVETYPE_FLYMISSILE
 const int MOVE_HITMODEL = 4;
 const int MOVE_WORLDONLY = 3;
index 715a05c..e174429 100644 (file)
@@ -267,7 +267,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 
        // GLOWMOD AND DEATH FADING
        if(self.colormap > 0)
-               self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? self.colormap : stof(getplayerkeyvalue(self.colormap - 1, "colors"))) & 0x0F, TRUE) * 2;
+               self.glowmod = colormapPaletteColor(((self.colormap >= 1024) ? self.colormap : stof(getplayerkeyvalue(self.colormap - 1, "colors"))) & 0x0F, true) * 2;
        else
                self.glowmod = '1 1 1';
 
@@ -638,9 +638,9 @@ void CSQCModel_Hook_PreDraw(bool isplayer)
                                        onground = 1;
                                self.anim_prev_pmove_flags = self.pmove_flags;
                                if(self.pmove_flags & PMF_DUCKED)
-                                       animdecide_setstate(self, self.anim_state | ANIMSTATE_DUCK, FALSE);
+                                       animdecide_setstate(self, self.anim_state | ANIMSTATE_DUCK, false);
                                else if(self.anim_state & ANIMSTATE_DUCK)
-                                       animdecide_setstate(self, self.anim_state - ANIMSTATE_DUCK, FALSE);
+                                       animdecide_setstate(self, self.anim_state - ANIMSTATE_DUCK, false);
                        }
                        else
                        {
@@ -668,7 +668,7 @@ void CSQCModel_Hook_PreDraw(bool isplayer)
                        self.frame1time = self.anim_frame1time;
                        self.frame2 = self.anim_frame2;
                        self.frame2time = self.anim_frame2time;
-                       CSQCModel_InterpolateAnimation_2To4_Note(sf | CSQCMODEL_PROPERTY_LERPFRAC, FALSE);
+                       CSQCModel_InterpolateAnimation_2To4_Note(sf | CSQCMODEL_PROPERTY_LERPFRAC, false);
                        CSQCModel_InterpolateAnimation_2To4_Do();
                        if(doblend)
                        {
index 1d97ead..544c365 100644 (file)
@@ -106,7 +106,7 @@ void DamageEffect(vector hitorg, float dmg, int type, int specnum)
 void Ent_DamageInfo(float isNew)
 {
        float dmg, rad, edge, thisdmg;
-       bool hitplayer = FALSE;
+       bool hitplayer = false;
        int species, forcemul;
        vector force, thisforce;
        entity oldself;
@@ -188,7 +188,7 @@ void Ent_DamageInfo(float isNew)
                DamageEffect(w_org, thisdmg, w_deathtype, species);
 
                if(self.isplayermodel)
-                       hitplayer = TRUE; // this impact damaged a player
+                       hitplayer = true; // this impact damaged a player
        }
 
        self = oldself;
index e189ff9..ac1208d 100644 (file)
@@ -134,12 +134,12 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
 
 float stringwidth_colors(string s, vector theSize)
 {
-       return stringwidth(s, TRUE, theSize);
+       return stringwidth(s, true, theSize);
 }
 
 float stringwidth_nocolors(string s, vector theSize)
 {
-       return stringwidth(s, FALSE, theSize);
+       return stringwidth(s, false, theSize);
 }
 
 void drawstringright(vector position, string text, vector theScale, vector rgb, float theAlpha, float flag)
@@ -1040,7 +1040,7 @@ void HUD_Ammo(void)
        {
                if(autocvar__hud_configure)
                {
-                       DrawAmmoItem(pos, ammo_size, ammo_rockets, TRUE, FALSE);
+                       DrawAmmoItem(pos, ammo_size, ammo_rockets, true, false);
                }
                else
                {
@@ -1048,7 +1048,7 @@ void HUD_Ammo(void)
                                pos,
                                ammo_size,
                                (get_weaponinfo(switchweapon)).ammo_field,
-                               TRUE,
+                               true,
                                infinite_ammo
                        );
                }
@@ -1795,7 +1795,7 @@ void HUD_Notify(void)
                        if (attacker != "")
                        {
                                attacker = textShortenToWidth(attacker, name_maxwidth, font_size, stringwidth_colors);
-                               attacker_pos = pos + attacker_right - eX * stringwidth(attacker, TRUE, font_size) + name_top;
+                               attacker_pos = pos + attacker_right - eX * stringwidth(attacker, true, font_size) + name_top;
                                drawcolorcodedstring(attacker_pos, attacker, font_size, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
                        }
                }
@@ -2120,7 +2120,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
                        if (team_count)
                                score_color = Team_ColorRGB(ColorByTeam(floor((i - first_pl) / players_per_team))) * 0.8;
                        s = textShortenToWidth(s, name_size, fontsize, stringwidth_colors);
-                       drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, true, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
                        drawstring(pos + eX * (name_size + spacing_size), ftos(score), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
                        pos.y += fontsize.y;
                }
@@ -2177,7 +2177,7 @@ void HUD_Score_Rankings(vector pos, vector mySize, entity me)
                if (team_count)
                        score_color = Team_ColorRGB(pl.team) * 0.8;
                s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
-               drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, TRUE, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, true, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
                drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores[ps_primary])), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
                pos.y += fontsize.y;
                ++i;
@@ -2420,11 +2420,11 @@ void HUD_RaceTimer (void)
        if(autocvar__hud_configure)
        {
                s = "0:13:37";
-               drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize.y), s, '0.60 0.60 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, false, '0.60 0.60 0' * mySize.y), s, '0.60 0.60 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
                s = _("^1Intermediate 1 (+15.42)");
-               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize.y) + eY * 0.60 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.20 * mySize.y) + eY * 0.60 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
                s = sprintf(_("^1PENALTY: %.1f (%s)"), 2, "missing a checkpoint");
-               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.20 * mySize.y) + eY * 0.80 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.20 * mySize.y) + eY * 0.80 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
        }
        else if(race_checkpointtime)
        {
@@ -2457,7 +2457,7 @@ void HUD_RaceTimer (void)
 
                if(s != "" && a > 0)
                {
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                if(race_penaltytime)
@@ -2466,14 +2466,14 @@ void HUD_RaceTimer (void)
                        if(a > 0)
                        {
                                s = sprintf(_("^1PENALTY: %.1f (%s)"), race_penaltytime * 0.1, race_penaltyreason);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize.y) + eY * 0.8 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.8 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
 
                if(forcetime != "")
                {
                        a = bound(0, (time - race_checkpointtime) / 0.5, 1);
-                       drawstring_expanding(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(forcetime, FALSE, '1 1 0' * 0.6 * mySize.y), forcetime, '1 1 0' * 0.6 * mySize.y, '1 1 1', panel_fg_alpha, 0, a);
+                       drawstring_expanding(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(forcetime, false, '1 1 0' * 0.6 * mySize.y), forcetime, '1 1 0' * 0.6 * mySize.y, '1 1 1', panel_fg_alpha, 0, a);
                }
                else
                        a = 1;
@@ -2481,7 +2481,7 @@ void HUD_RaceTimer (void)
                if(race_laptime && race_checkpoint != 255)
                {
                        s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime));
-                       drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, FALSE, '0.6 0.6 0' * mySize.y), s, '0.6 0.6 0' * mySize.y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                       drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, false, '0.6 0.6 0' * mySize.y), s, '0.6 0.6 0' * mySize.y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
        }
        else
@@ -2490,13 +2490,13 @@ void HUD_RaceTimer (void)
                {
                        a = bound(0, 2 - (time - race_mycheckpointtime), 1);
                        s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -(race_mycheckpointenemy == ""), race_mycheckpointlapsdelta, race_mycheckpointenemy);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
                if(race_othercheckpointtime && race_othercheckpointenemy != "")
                {
                        a = bound(0, 2 - (time - race_othercheckpointtime), 1);
                        s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -(race_othercheckpointenemy == ""), race_othercheckpointlapsdelta, race_othercheckpointenemy);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                }
 
                if(race_penaltytime && !race_penaltyaccumulator)
@@ -2509,7 +2509,7 @@ void HUD_RaceTimer (void)
                                        s = sprintf(_("^1PENALTY: %.1f (%s)"), (t - time) * 0.1, race_penaltyreason);
                                else
                                        s = sprintf(_("^2PENALTY: %.1f (%s)"), 0, race_penaltyreason);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, TRUE, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
                        }
                }
        }
@@ -3626,7 +3626,7 @@ void HUD_EngineInfo(void)
 //
 #define drawInfoMessage(s)\
        if(autocvar_hud_panel_infomessages_flip)\
-               o_x = pos.x + mySize.x - stringwidth(s, TRUE, fontsize);\
+               o_x = pos.x + mySize.x - stringwidth(s, true, fontsize);\
        drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);\
        o.y += fontsize.y;
 void HUD_InfoMessages(void)
@@ -4115,7 +4115,7 @@ void centerprint_generic(float new_id, string strMessage, float duration, float
                return;
 
        if (!centerprint_showing)
-               centerprint_showing = TRUE;
+               centerprint_showing = true;
 
        for (i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
        {
@@ -4259,7 +4259,7 @@ void HUD_CenterPrint (void)
        float a, sz, align, current_msg_posY = 0, msg_size;
        vector pos;
        string ts;
-       float all_messages_expired = TRUE;
+       float all_messages_expired = true;
 
        pos = panel_pos;
        if (autocvar_hud_panel_centerprint_flip)
@@ -4282,7 +4282,7 @@ void HUD_CenterPrint (void)
                                continue;
                }
 
-               all_messages_expired = FALSE;
+               all_messages_expired = false;
 
                // fade the centerprint_hud in/out
                if(centerprint_time[j] < 0)  // Expired but forced. Expire time is the fade-in time.
@@ -4346,7 +4346,7 @@ void HUD_CenterPrint (void)
                                if (ts != "")
                                {
                                        if (align)
-                                               pos_x = panel_pos.x + (panel_size.x - stringwidth(ts, TRUE, fontsize)) * align;
+                                               pos_x = panel_pos.x + (panel_size.x - stringwidth(ts, true, fontsize)) * align;
                                        if (a > 0.5/255.0)  // Otherwise guaranteed invisible - don't show. This is checked a second time after some multiplications with other factors were done so temporary changes of these cannot cause flicker.
                                                drawcolorcodedstring(pos + eY * 0.5 * (1 - sz) * fontsize.y, ts, fontsize, a, DRAWFLAG_NORMAL);
                                        pos.y += fontsize.y;
@@ -4387,7 +4387,7 @@ void HUD_CenterPrint (void)
        drawfontscale = '1 1 0';
        if (all_messages_expired)
        {
-               centerprint_showing = FALSE;
+               centerprint_showing = false;
                reset_centerprint_messages();
        }
 }
index 43e8e57..31e865f 100644 (file)
@@ -1173,7 +1173,7 @@ void HUD_Panel_Mouse()
                if(menu_enabled == 2)
                        mouse_over_panel = 0;
                else
-                       mouse_over_panel = HUD_Panel_Check_Mouse_Pos(TRUE);
+                       mouse_over_panel = HUD_Panel_Check_Mouse_Pos(true);
                if (mouse_over_panel && !tab_panel)
                        drawfill(panel_pos - '1 1 0' * panel_bg_border, panel_size + '2 2 0' * panel_bg_border, '1 1 1', .1, DRAWFLAG_NORMAL);
        }
index d69a718..8b6cbac 100644 (file)
@@ -118,7 +118,7 @@ float current_zoomfraction;
 float cs_project_is_b0rked;
 float vid_width, vid_height, vid_pixelheight;
 
-float camera_active;           // Demo camera is active if set to TRUE
+float camera_active;           // Demo camera is active if set to true
 float chase_active_backup;
 float camera_roll;
 vector camera_direction;
index 8e4ede2..e82961e 100644 (file)
@@ -42,7 +42,7 @@ string MapVote_FormatMapItem(int id, string map, float count, float maxwidth, ve
        }
        else
                post = "";
-       maxwidth -= stringwidth(pre, FALSE, fontsize) + stringwidth(post, FALSE, fontsize);
+       maxwidth -= stringwidth(pre, false, fontsize) + stringwidth(post, false, fontsize);
        map = textShortenToWidth(map, maxwidth, fontsize, stringwidth_nocolors);
        return strcat(pre, map, post);
 }
index 41c64b8..71dfdef 100644 (file)
@@ -335,13 +335,13 @@ void drawpic_aspect_skin_expanding_two(vector position, string pic, vector theSc
 
 // 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);
 }
 
@@ -353,7 +353,7 @@ void drawstring_expanding(vector position, string text, vector theScale, vector
 
        drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
-       drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, FALSE, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), rgb, theAlpha * (1 - fadelerp), flag);
+       drawstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, false, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), rgb, theAlpha * (1 - fadelerp), flag);
        // width parameter:
        //    (scale_x * sz / drawfontscale_x) * drawfontscale_x * SIZE1 / (scale_x * sz)
        //    SIZE1
@@ -362,7 +362,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);
 }
 
@@ -373,12 +373,12 @@ void drawcolorcodedstring_expanding(vector position, string text, vector theScal
 
        drawfontscale = sz * '1 1 0';
        dummyfunction(0, 0, 0, 0, 0, 0, 0, 0);
-       drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, TRUE, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag);
+       drawcolorcodedstring(position + expandingbox_resize_centered_box_offset(sz, theScale, stringwidth(text, true, theScale * (sz / drawfontscale.x)) / (theScale.x * sz)), text, theScale * (sz / drawfontscale.x), theAlpha * (1 - fadelerp), flag);
        drawfontscale = '1 1 0';
 }
 
 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);
 }
 
@@ -597,7 +597,7 @@ vector getcsqcplayercolor(float pl)
        if(e)
        {
                if(e.colormap > 0)
-                       return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, TRUE);
+                       return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, true);
        }
 
        return '1 1 1';
@@ -611,7 +611,7 @@ float getplayerisdead(float pl)
        if(e)
                return e.csqcmodel_isdead;
 
-       return FALSE;
+       return false;
 }
 
 void URI_Get_Callback(float id, float status, string data)
index e08c724..a85ca13 100644 (file)
@@ -125,11 +125,11 @@ void _Movetype_LinkEdict_TouchAreaGrid() // SV_LinkEdict_TouchAreaGrid
                        self = e;
                        other = oldself;
 
-                       trace_allsolid = FALSE;
-                       trace_startsolid = FALSE;
+                       trace_allsolid = false;
+                       trace_startsolid = false;
                        trace_fraction = 1;
-                       trace_inwater = FALSE;
-                       trace_inopen = TRUE;
+                       trace_inwater = false;
+                       trace_inopen = true;
                        trace_endpos = e.origin;
                        trace_plane_normal = '0 0 1';
                        trace_plane_dist = 0;
@@ -198,17 +198,17 @@ float _Movetype_TestEntityPosition(vector ofs) // SV_TestEntityPosition
        self.dphitcontentsmask = cont;
 
        if(trace_startsolid)
-               return TRUE;
+               return true;
 
        if(vlen(trace_endpos - self.move_origin) > 0.0001)
                self.move_origin = trace_endpos;
-       return FALSE;
+       return false;
 }
 
 float _Movetype_UnstickEntity() // SV_UnstickEntity
 {
        if(!_Movetype_TestEntityPosition('0 0 0'))
-               return TRUE;
+               return true;
        if(!_Movetype_TestEntityPosition('-1 0 0')) goto success;
        if(!_Movetype_TestEntityPosition('1 0 0')) goto success;
        if(!_Movetype_TestEntityPosition('0 -1 0')) goto success;
@@ -224,11 +224,11 @@ float _Movetype_UnstickEntity() // SV_UnstickEntity
                if(!_Movetype_TestEntityPosition('0 0 1' * i)) goto success;
        }
        dprintf("Can't unstick an entity (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.move_origin));
-       return FALSE;
+       return false;
 :success
        dprintf("Sucessfully unstuck an entity (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.move_origin));
-       _Movetype_LinkEdict(TRUE);
-       return TRUE;
+       _Movetype_LinkEdict(true);
+       return true;
 }
 
 vector _Movetype_ClipVelocity(vector vel, vector norm, float f) // SV_ClipVelocity
@@ -293,7 +293,7 @@ void _Movetype_Physics_Toss(float dt) // SV_Physics_Toss
                }
        }
 
-       self.move_suspendedinair = FALSE;
+       self.move_suspendedinair = false;
 
        _Movetype_CheckVelocity();
 
@@ -324,14 +324,14 @@ void _Movetype_Physics_Toss(float dt) // SV_Physics_Toss
        {
                vector move;
                move = self.move_velocity * movetime;
-               _Movetype_PushEntity(move, TRUE);
+               _Movetype_PushEntity(move, true);
                if(wasfreed(self))
                        return;
 
                if(trace_startsolid)
                {
                        _Movetype_UnstickEntity();
-                       _Movetype_PushEntity(move, FALSE);
+                       _Movetype_PushEntity(move, false);
                        if(wasfreed(self))
                                return;
                }
@@ -378,7 +378,7 @@ void _Movetype_Physics_Toss(float dt) // SV_Physics_Toss
                                self.move_flags |= FL_ONGROUND;
                                self.move_groundentity = trace_ent;
                                if(trace_ent.solid == SOLID_BSP)
-                                       self.move_suspendedinair = TRUE;
+                                       self.move_suspendedinair = true;
                                self.move_velocity = '0 0 0';
                                self.move_avelocity = '0 0 0';
                        }
@@ -426,7 +426,7 @@ void _Movetype_Physics_Frame(float movedt)
                        _Movetype_CheckWater(self);
                        self.move_origin = self.move_origin + ticrate * self.move_velocity;
                        self.move_angles = self.move_angles + ticrate * self.move_avelocity;
-                       _Movetype_LinkEdict(FALSE);
+                       _Movetype_LinkEdict(false);
                        break;
                case MOVETYPE_STEP:
                        error("SV_Physics_Step not implemented");
index 1132d06..9bca7b0 100644 (file)
@@ -5,7 +5,7 @@ float prandom_seed;
 float prandom()
 {
        float c;
-       c = crc16(FALSE, strcat(ftos(prandom_seed), ftos(prandom_seed + M_PI)));
+       c = crc16(false, strcat(ftos(prandom_seed), ftos(prandom_seed + M_PI)));
        prandom_seed = c;
 
 #ifdef USE_PRANDOM_DEBUG
index 69bdd01..40ee14d 100644 (file)
@@ -354,10 +354,10 @@ void Cmd_HUD_SetFields(float argc)
                float nocomplain;
                str = argv(i+1);
 
-               nocomplain = FALSE;
+               nocomplain = false;
                if(substring(str, 0, 1) == "?")
                {
-                       nocomplain = TRUE;
+                       nocomplain = true;
                        str = substring(str, 1, strlen(str) - 1);
                }
 
@@ -367,13 +367,13 @@ void Cmd_HUD_SetFields(float argc)
                        pattern = substring(str, 0, slash);
                        str = substring(str, slash + 1, strlen(str) - (slash + 1));
 
-                       if (!isGametypeInFilter(gametype, teamplay, FALSE, pattern))
+                       if (!isGametypeInFilter(gametype, teamplay, false, pattern))
                                continue;
                }
 
                strunzone(hud_title[hud_num_fields]);
                hud_title[hud_num_fields] = strzone(TranslateScoresLabel(str));
-               hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
+               hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], false, hud_fontsize);
                str = strtolower(str);
 
                if(str == "ping") {
@@ -452,7 +452,7 @@ void Cmd_HUD_SetFields(float argc)
                                }
                                hud_title[1] = strzone("|");
                                hud_field[1] = SP_SEPARATOR;
-                               hud_size[1] = stringwidth("|", FALSE, hud_fontsize);
+                               hud_size[1] = stringwidth("|", false, hud_fontsize);
                                ++hud_num_fields;
                                print("fixed missing field '|'\n");
                        }
@@ -461,7 +461,7 @@ void Cmd_HUD_SetFields(float argc)
                {
                        strunzone(hud_title[hud_num_fields]);
                        hud_title[hud_num_fields] = strzone("|");
-                       hud_size[hud_num_fields] = stringwidth("|", FALSE, hud_fontsize);
+                       hud_size[hud_num_fields] = stringwidth("|", false, hud_fontsize);
                        hud_field[hud_num_fields] = SP_SEPARATOR;
                        ++hud_num_fields;
                        print("fixed missing field '|'\n");
@@ -470,7 +470,7 @@ void Cmd_HUD_SetFields(float argc)
                {
                        strunzone(hud_title[hud_num_fields]);
                        hud_title[hud_num_fields] = strzone(TranslateScoresLabel(scores_label[ps_secondary]));
-                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
+                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], false, hud_fontsize);
                        hud_field[hud_num_fields] = ps_secondary;
                        ++hud_num_fields;
                        printf("fixed missing field '%s'\n", scores_label[ps_secondary]);
@@ -479,7 +479,7 @@ void Cmd_HUD_SetFields(float argc)
                {
                        strunzone(hud_title[hud_num_fields]);
                        hud_title[hud_num_fields] = strzone(TranslateScoresLabel(scores_label[ps_primary]));
-                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], FALSE, hud_fontsize);
+                       hud_size[hud_num_fields] = stringwidth(hud_title[hud_num_fields], false, hud_fontsize);
                        hud_field[hud_num_fields] = ps_primary;
                        ++hud_num_fields;
                        printf("fixed missing field '%s'\n", scores_label[ps_primary]);
@@ -646,7 +646,7 @@ string HUD_FixScoreboardColumnWidth(int i, string str)
        hud_fixscoreboardcolumnwidth_iconlen *= hud_fontsize.y / hud_fontsize.x; // fix icon aspect
 
        if(hud_fixscoreboardcolumnwidth_iconlen != 0)
-               hud_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", FALSE, hud_fontsize);
+               hud_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", false, hud_fontsize);
        else
                hud_fixscoreboardcolumnwidth_marginlen = 0;
 
@@ -665,10 +665,10 @@ string HUD_FixScoreboardColumnWidth(int i, string str)
                if (hud_fixscoreboardcolumnwidth_iconlen != 0)
                        namesize -= hud_fixscoreboardcolumnwidth_marginlen + hud_fixscoreboardcolumnwidth_iconlen;
                str = textShortenToWidth(str, namesize, hud_fontsize, stringwidth_colors);
-               hud_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE, hud_fontsize);
+               hud_fixscoreboardcolumnwidth_len = stringwidth(str, true, hud_fontsize);
        }
        else
-               hud_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE, hud_fontsize);
+               hud_fixscoreboardcolumnwidth_len = stringwidth(str, false, hud_fontsize);
 
        f = hud_fixscoreboardcolumnwidth_len + hud_fixscoreboardcolumnwidth_marginlen + hud_fixscoreboardcolumnwidth_iconlen;
        if(hud_size[i] < f)
@@ -904,7 +904,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
                                }
                        }
 
-                       tmp_x = stringwidth(hud_title[i], FALSE, hud_fontsize);
+                       tmp_x = stringwidth(hud_title[i], false, hud_fontsize);
                        tmp_x = (hud_size[i] - tmp.x);
                        drawstring(pos + tmp, hud_title[i], hud_fontsize, rgb * 1.5, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
                        pos.x -= hud_fontsize.x;
@@ -1046,7 +1046,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
                        s = sprintf("%d%%", weapon_stats*100);
 
                        float padding;
-                       padding = (weapon_width - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
+                       padding = (weapon_width - stringwidth(s, false, '1 0 0' * fontsize)) / 2; // center the accuracy value
 
                        if(!autocvar_scoreboard_accuracy_nocolors)
                                rgb = Accuracy_GetColor(weapon_stats);
@@ -1076,7 +1076,7 @@ vector HUD_DrawKeyValue(vector pos, string key, string value) {
        float px = pos.x;
        pos.x += hud_fontsize.x * 0.25;
        drawstring(pos, key, hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-       pos_x = xmax - stringwidth(value, FALSE, hud_fontsize) - hud_fontsize.x * 0.25;
+       pos_x = xmax - stringwidth(value, false, hud_fontsize) - hud_fontsize.x * 0.25;
        drawstring(pos, value, hud_fontsize, '1 1 1', scoreboard_alpha_fg, DRAWFLAG_NORMAL);
        pos_x = px;
        pos.y+= hud_fontsize.y;
@@ -1278,12 +1278,12 @@ void HUD_DrawScoreboard()
                        draw_beginBoldFont();
                        rgb = Team_ColorRGB(tm.team);
                        str = ftos(tm.(teamscores[ts_primary]));
-                       drawstring(pos + team_score_baseoffset - eX * stringwidth(str, FALSE, hud_fontsize * 1.5), str, hud_fontsize * 1.5, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                       drawstring(pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize * 1.5), str, hud_fontsize * 1.5, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
                        if(ts_primary != ts_secondary)
                        {
                                str = ftos(tm.(teamscores[ts_secondary]));
-                               drawstring(pos + team_score_baseoffset - eX * stringwidth(str, FALSE, hud_fontsize) + eY * hud_fontsize.y * 1.5, str, hud_fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+                               drawstring(pos + team_score_baseoffset - eX * stringwidth(str, false, hud_fontsize) + eY * hud_fontsize.y * 1.5, str, hud_fontsize, rgb, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
                        }
                        draw_endBoldFont();
 
@@ -1413,7 +1413,7 @@ void HUD_DrawScoreboard()
        }
 
        pos.y += 1.2 * hud_fontsize.y;
-       drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+       drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
        // print information about respawn status
        float respawn_time = getstatf(STAT_RESPAWN_TIME);
@@ -1448,7 +1448,7 @@ void HUD_DrawScoreboard()
                        str = sprintf(_("You are dead, press ^2%s^7 to respawn"), getcommandkey("jump", "+jump"));
 
                pos.y += 1.2 * hud_fontsize.y;
-               drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, true, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
        }
 
        scoreboard_bottom = pos.y + 2 * hud_fontsize.y;
index 7798986..5f40b26 100644 (file)
@@ -37,7 +37,7 @@ void Draw_ShowNames(entity ent)
                }
 
                // handle tag fading
-               float overlap = FALSE, onscreen, crosshairdistance;
+               float overlap = false, onscreen, crosshairdistance;
                vector o, eo;
 
                o = project_3d_to_2d(ent.origin);
@@ -56,7 +56,7 @@ void Draw_ShowNames(entity ent)
                                        eo_z = 0;
                                        if(vlen((eX * o.x + eY * o.y) - eo) < autocvar_hud_shownames_antioverlap_distance && vlen(ent.origin - view_origin) > vlen(e.origin - view_origin))
                                        {
-                                               overlap = TRUE;
+                                               overlap = true;
                                                break;
                                        }
                                }
@@ -72,9 +72,9 @@ void Draw_ShowNames(entity ent)
                                ent.pointtime = time;
 
                        if (!(ent.pointtime + autocvar_hud_shownames_crosshairdistance_time > time))
-                               overlap = TRUE;
+                               overlap = true;
                        else
-                               overlap = (autocvar_hud_shownames_crosshairdistance_antioverlap ? overlap : FALSE); // override what antioverlap says unless allowed by cvar.
+                               overlap = (autocvar_hud_shownames_crosshairdistance_antioverlap ? overlap : false); // override what antioverlap says unless allowed by cvar.
                }
 
                if(!ent.fadedelay)
@@ -167,7 +167,7 @@ void Draw_ShowNames(entity ent)
                        s = textShortenToWidth(s, namewidth, '1 1 0' * autocvar_hud_shownames_fontsize, stringwidth_colors);
 
                        float width;
-                       width = stringwidth(s, TRUE, '1 1 0' * autocvar_hud_shownames_fontsize);
+                       width = stringwidth(s, true, '1 1 0' * autocvar_hud_shownames_fontsize);
 
                        if (width != namewidth)
                                namepos.x += (namewidth - width) / 2;
index 9cf5aa0..2456ee8 100644 (file)
@@ -156,8 +156,8 @@ void draw_teamradar_link(vector start, vector end, int colors)
        norm_y = norm.z;
        norm_z = 0;
 
-       c0 = colormapPaletteColor(colors & 0x0F, FALSE);
-       c1 = colormapPaletteColor((colors & 0xF0) / 0x10, FALSE);
+       c0 = colormapPaletteColor(colors & 0x0F, false);
+       c1 = colormapPaletteColor((colors & 0xF0) / 0x10, false);
 
        R_BeginPolygon("", 0);
        R_PolygonVertex(start - norm, '0 0 0', c0, panel_fg_alpha);
index aaa43bd..440067a 100644 (file)
@@ -80,7 +80,7 @@ void turret_precache(float _tid)
             precache_sound ("weapons/uzi_fire.wav");
             break;
     }
-    turret_is_precache[_tid] = TRUE;
+    turret_is_precache[_tid] = true;
 }
 
 void turret_tid2info(float _tid)
@@ -513,7 +513,7 @@ void turret_gibboom()
     pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1);
 
     for (i = 1; i < 5; i = i + 1)
-        turret_gibtoss(strcat("models/turrets/head-gib", ftos(i), ".md3"), self.origin + '0 0 2', self.velocity + randomvec() * 700, '0 0 0', FALSE);
+        turret_gibtoss(strcat("models/turrets/head-gib", ftos(i), ".md3"), self.origin + '0 0 2', self.velocity + randomvec() * 700, '0 0 0', false);
 }
 
 entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, float _explode)
@@ -563,23 +563,23 @@ void turret_die()
     {
         // Base
         if(self.turret_type == TID_EWHEEL)
-            turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 400' + '0.1 0.1 1' * (random() * 400), '-1 -1 -1', TRUE);
+            turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 400' + '0.1 0.1 1' * (random() * 400), '-1 -1 -1', true);
         else if (self.turret_type == TID_WALKER)
-            turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 300' + '0.1 0.1 1' * (random() * 200), '-1 -1 -1', TRUE);
+            turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 300' + '0.1 0.1 1' * (random() * 200), '-1 -1 -1', true);
         else if (self.turret_type == TID_TESLA)
-            turret_gibtoss(tid2info_base, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', FALSE);
+            turret_gibtoss(tid2info_base, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', false);
         else
         {
             if (random() > 0.5)
             {
-                turret_gibtoss("models/turrets/base-gib2.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE);
-                turret_gibtoss("models/turrets/base-gib3.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE);
-                turret_gibtoss("models/turrets/base-gib4.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE);
+                turret_gibtoss("models/turrets/base-gib2.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', false);
+                turret_gibtoss("models/turrets/base-gib3.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', false);
+                turret_gibtoss("models/turrets/base-gib4.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', false);
             }
             else
-                turret_gibtoss("models/turrets/base-gib1.md3", self.origin + '0 0 8', '0 0 0', '0 0 0', TRUE);
+                turret_gibtoss("models/turrets/base-gib1.md3", self.origin + '0 0 8', '0 0 0', '0 0 0', true);
 
-            entity headgib = turret_gibtoss(tid2info_head, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', TRUE);
+            entity headgib = turret_gibtoss(tid2info_head, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', true);
             if(headgib)
             {
                 headgib.angles = headgib.move_angles = self.tur_head.angles;
index b1eaab3..8d2ba7f 100644 (file)
@@ -145,7 +145,7 @@ void Ent_TubaNote(float bIsNew)
                                self.enemy.enemy = spawn();
                                self.enemy.enemy.classname = "tuba_note_2";
                        }
-                       bIsNew = TRUE;
+                       bIsNew = true;
                }
 
                self.enemy.attenuate = att;
index c8cb149..04f13af 100644 (file)
@@ -325,7 +325,7 @@ void CSQC_BUMBLE_HUD()
 // Right gunner slot occupied?
        if(!AuxiliaryXhair[1].draw2d)
        {
-               shield = (picsize.x * 0.5) - (0.5 * stringwidth(_("No right gunner!"), FALSE, '1 0 0' * picsize.y + '0 1 0' * picsize.y));
+               shield = (picsize.x * 0.5) - (0.5 * stringwidth(_("No right gunner!"), false, '1 0 0' * picsize.y + '0 1 0' * picsize.y));
                drawfill(hudloc + picloc - '0.2 0.2 0', picsize + '0.4 0.4 0', '0.25 0.25 0.25', 0.75, DRAWFLAG_NORMAL);
                drawstring(hudloc + picloc + '1 0 0' * shield, _("No right gunner!"), '1 0 0' * picsize.y + '0 1 0' * picsize.y, '1 0 0' + '0 1 1' * sin(time * 10), 1, DRAWFLAG_NORMAL);
        }
@@ -347,7 +347,7 @@ void CSQC_BUMBLE_HUD()
 // Left gunner slot occupied?
        if(!AuxiliaryXhair[2].draw2d)
        {
-               shield = (picsize.x * 0.5) - (0.5 * stringwidth(_("No left gunner!"), FALSE, '1 0 0' * picsize.y + '0 1 0' * picsize.y));
+               shield = (picsize.x * 0.5) - (0.5 * stringwidth(_("No left gunner!"), false, '1 0 0' * picsize.y + '0 1 0' * picsize.y));
                drawfill(hudloc + picloc - '0.2 0.2 0', picsize + '0.4 0.4 0', '0.25 0.25 0.25', 0.75, DRAWFLAG_NORMAL);
                drawstring(hudloc + picloc + '1 0 0' * shield, _("No left gunner!"), '1 0 0' * picsize.y + '0 1 0' * picsize.y, '1 0 0' + '0 1 1' * sin(time * 10), 1, DRAWFLAG_NORMAL);
        }
index 9390396..de6970b 100644 (file)
@@ -149,7 +149,7 @@ vector drawspritetext(vector o, float ang, float minwidth, vector rgb, float a,
        float sw, w, h;
        float aspect, sa, ca;
 
-       sw = stringwidth(s, FALSE, fontsize);
+       sw = stringwidth(s, false, fontsize);
        if(sw > minwidth)
                w = sw;
        else
@@ -720,7 +720,7 @@ void WaypointSprite_Load_Frames(string ext)
 {
        float dh, n, i, o, f;
        string s, sname, sframes;
-       dh = search_begin(strcat("models/sprites/*_frame*", ext), FALSE, FALSE);
+       dh = search_begin(strcat("models/sprites/*_frame*", ext), false, false);
        if (dh < 0)
                 return;
        float ext_len = strlen(ext);
index eae512a..3c388a8 100644 (file)
@@ -94,7 +94,7 @@ void GenericCommand_qc_curl(float request, float argc)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       bool do_exec = FALSE;
+                       bool do_exec = false;
                        string do_cvar = string_null;
                        float key = -1;
                        int i;
@@ -108,7 +108,7 @@ void GenericCommand_qc_curl(float request, float argc)
                                }
                                if(argv(i) == "--exec")
                                {
-                                       do_exec = TRUE;
+                                       do_exec = true;
                                        continue;
                                }
                                if(argv(i) == "--key" && i+2 < argc)
@@ -222,18 +222,18 @@ void GenericCommand_dumpnotifs(float request)
                case CMD_REQUEST_COMMAND:
                {
                        #ifndef MENUQC
-                       float fh, alsoprint = FALSE;
+                       float fh, alsoprint = false;
                        string filename = argv(1);
 
                        if(filename == "")
                        {
                                filename = "notifications_dump.cfg";
-                               alsoprint = FALSE;
+                               alsoprint = false;
                        }
                        else if(filename == "-")
                        {
                                filename = "notifications_dump.cfg";
-                               alsoprint = TRUE;
+                               alsoprint = true;
                        }
                        fh = fopen(filename, FILE_WRITE);
 
@@ -279,12 +279,12 @@ void GenericCommand_dumpweapons(float request) // WEAPONTODO: make this work wit
                        if(filename == "")
                        {
                                filename = "weapons_dump.cfg";
-                               wep_config_alsoprint = FALSE;
+                               wep_config_alsoprint = false;
                        }
                        else if(filename == "-")
                        {
                                filename = "weapons_dump.cfg";
-                               wep_config_alsoprint = TRUE;
+                               wep_config_alsoprint = true;
                        }
                        wep_config_file = fopen(filename, FILE_WRITE);
                        
@@ -652,23 +652,23 @@ void GenericCommand_macro_help()
 float GenericCommand_macro_command(float argc, string command)
 {
        #define GENERIC_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               { if(name == strtolower(argv(0))) { function; return true; } }
 
        GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
        #undef GENERIC_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 float GenericCommand_macro_usage(float argc)
 {
        #define GENERIC_COMMAND(name,function,description) \
-               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               { if(name == strtolower(argv(1))) { function; return true; } }
 
        GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "")
        #undef GENERIC_COMMAND
 
-       return FALSE;
+       return false;
 }
 
 void GenericCommand_macro_write_aliases(float fh)
@@ -702,13 +702,13 @@ float GenericCommand(string command)
 
        if(GenericCommand_macro_command(argc, command)) // continue as usual and scan for normal commands
        {
-               return TRUE; // handled by one of the above GenericCommand_* functions
+               return true; // handled by one of the above GenericCommand_* functions
        }
        else if(argc >= 3 && argv(0) == "red")
        {
                s = substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2));
                localcmd(strcat(argv(1), " ", GenericCommand_markup(s)));
-               return TRUE;
+               return true;
        }
        else if(argc >= 3 && crc16(0, argv(0)) == 38566 && crc16(0, strcat(argv(0), argv(0), argv(0))) == 59830)
        {
@@ -748,7 +748,7 @@ float GenericCommand(string command)
 
                localcmd(strcat(argv(1), " ", s));
 
-               return TRUE;
+               return true;
        }
        else if(argc >= 3 && crc16(0, argv(0)) == 3826 && crc16(0, strcat(argv(0), argv(0), argv(0))) == 55790)
        {
@@ -783,8 +783,8 @@ float GenericCommand(string command)
 
                localcmd(strcat(argv(1), " ", s2));
 
-               return TRUE;
+               return true;
        }
 
-       return FALSE;
+       return false;
 }
index 223d326..480bac3 100644 (file)
@@ -10,7 +10,7 @@ string rpn_pop()
                return rpn_stack[rpn_sp];
        } else {
                print("rpn: stack underflow\n");
-               rpn_error = TRUE;
+               rpn_error = true;
                return "";
        }
 }
@@ -21,7 +21,7 @@ void rpn_push(string s)
                ++rpn_sp;
        } else {
                print("rpn: stack overflow\n");
-               rpn_error = TRUE;
+               rpn_error = true;
        }
 }
 string rpn_get()
@@ -30,7 +30,7 @@ string rpn_get()
                return rpn_stack[rpn_sp - 1];
        } else {
                print("rpn: empty stack\n");
-               rpn_error = TRUE;
+               rpn_error = true;
                return "";
        }
 }
@@ -40,7 +40,7 @@ void rpn_set(string s)
                rpn_stack[rpn_sp - 1] = s;
        } else {
                print("rpn: empty stack\n");
-               rpn_error = TRUE;
+               rpn_error = true;
        }
 }
 
@@ -69,7 +69,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                        if(argc >= 2)
                        {
                                rpn_sp = 0;
-                               rpn_error = FALSE;
+                               rpn_error = false;
                                for(rpnpos = 1; rpnpos < argc; ++rpnpos)
                                {
                                        rpncmd = argv(rpnpos);
@@ -104,7 +104,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                else
                                                {
                                                        print("rpn: empty cvar name for 'def'\n");
-                                                       rpn_error = TRUE;
+                                                       rpn_error = true;
                                                }
                                        } else if(rpncmd == "defs" || rpncmd == "@") {
                                                s = "";
@@ -129,7 +129,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                else
                                                {
                                                        print("rpn: empty cvar name for 'defs'\n");
-                                                       rpn_error = TRUE;
+                                                       rpn_error = true;
                                                }
                                        } else if(rpncmd == "load") {
                                                rpn_set(cvar_string(rpn_get()));
@@ -249,7 +249,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                        } else if(rpncmd == "rand") {
                                                rpn_setf(ceil(random() * rpn_getf()) - 1);
                                        } else if(rpncmd == "crc16") {
-                                               rpn_setf(crc16(FALSE, rpn_get()));
+                                               rpn_setf(crc16(false, rpn_get()));
                                        } else if(rpncmd == "put") {
                                                s2 = rpn_pop();
                                                if (!rpn_error)
@@ -342,7 +342,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                i = stof(db_get(rpn_db, "stack.pos"));
                                                if(!j)
                                                {
-                                                       rpn_error = TRUE;
+                                                       rpn_error = true;
                                                        print("rpn: empty database\n");
                                                } else {
                                                        --j;
@@ -381,7 +381,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                        if(i < 0 || i >= j)
                                                        {
                                                                print("rpn: database cursor out of bounds\n");
-                                                               rpn_error = TRUE;
+                                                               rpn_error = true;
                                                        }
                                                        if(!rpn_error)
                                                        {
@@ -393,7 +393,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                j = stof(db_get(rpn_db, "stack.pointer"));
                                                if(!j)
                                                {
-                                                       rpn_error = TRUE;
+                                                       rpn_error = true;
                                                        print("rpn: empty database, cannot move cursor\n");
                                                }
                                                if(!rpn_error)
@@ -409,7 +409,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                        if(i < 0 || i >= j)
                                                        {
                                                                print("rpn: database cursor destination out of bounds\n");
-                                                               rpn_error = TRUE;
+                                                               rpn_error = true;
                                                        }
                                                        if(!rpn_error)
                                                        {
@@ -511,7 +511,7 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                        if (!fexists(s))
                                                        {
                                                                print("rpn: ERROR: ", s, " does not exist!\n");
-                                                               rpn_error = TRUE;
+                                                               rpn_error = true;
                                                        }
                                                }
                                        } else if(rpncmd == "fexists") {
@@ -524,9 +524,9 @@ void GenericCommand_rpn(float request, float argc, string command)
                                                                rpn_setf(0);
                                                }
                                        } else if(rpncmd == "localtime") {
-                                               rpn_set(strftime(TRUE, rpn_get()));
+                                               rpn_set(strftime(true, rpn_get()));
                                        } else if(rpncmd == "gmtime") {
-                                               rpn_set(strftime(FALSE, rpn_get()));
+                                               rpn_set(strftime(false, rpn_get()));
                                        } else if(rpncmd == "time") {
                                                rpn_pushf(time);
                                        } else if(rpncmd == "digest") {
index 98a22e4..7299b28 100644 (file)
@@ -103,7 +103,7 @@ void MapInfo_Enumerate()
                _MapInfo_globopen = 0;
        }
        MapInfo_Cache_Invalidate();
-       _MapInfo_globhandle = search_begin("maps/*.bsp", TRUE, TRUE);
+       _MapInfo_globhandle = search_begin("maps/*.bsp", true, true);
        if(_MapInfo_globhandle >= 0)
        {
                _MapInfo_globcount = search_getsize(_MapInfo_globhandle);
@@ -442,7 +442,7 @@ void _MapInfo_Map_ApplyGametype(string s, int pWantedType, int pThisType, int lo
                return;
 
        if(load_default)
-               _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, FALSE);
+               _MapInfo_Map_ApplyGametype(_MapInfo_GetDefault(pThisType), pWantedType, pThisType, false);
 
        if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT || pWantedType == MAPINFO_TYPE_RACE || pWantedType == MAPINFO_TYPE_CTS) // these modes don't use fraglimit
        {
@@ -572,7 +572,7 @@ float _MapInfo_GetTeamPlayBool(float t)
        for(e = MapInfo_Type_first; e; e = e.enemy)
                if(t == e.items)
                        return e.team;
-       return FALSE;
+       return false;
 }
 
 void _MapInfo_Map_ApplyGametypeEx(string s, int pWantedType, int pThisType)
@@ -860,16 +860,16 @@ float MapInfo_isRedundant(string fn, string t)
        t = strreplace("'", "-", t);
 
        if(!strcasecmp(fn, t))
-               return TRUE;
+               return true;
 
        // we allow the visible title to have punctuation the file name does
        // not, but not vice versa
        t = strreplace("-", "", t);
 
        if(!strcasecmp(fn, t))
-               return TRUE;
+               return true;
 
-       return FALSE;
+       return false;
 }
 
 // load info about a map by name into the MapInfo_Map_* globals
@@ -1039,7 +1039,7 @@ float MapInfo_Get_ByName_NoFallbacks(string pFilename, int pAllowGenerate, int p
                        f = MapInfo_Type_FromString(t);
                        dprint("Map ", pFilename, " contains the legacy 'type' keyword which is deprecated and will be removed in the future. Please migrate the mapinfo file to 'gametype'.\n");
                        if(f)
-                               _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, TRUE);
+                               _MapInfo_Map_ApplyGametype (s, pGametypeToSet, f, true);
                        else
                                dprint("Map ", pFilename, " supports unknown game type ", t, ", ignored\n");
                }
@@ -1394,7 +1394,7 @@ void MapInfo_Shutdown()
        {
                search_end(_MapInfo_globhandle);
                _MapInfo_globhandle = -1;
-               _MapInfo_globopen = FALSE;
+               _MapInfo_globopen = false;
        }
 }
 
index 8bd0871..1f7b7ad 100644 (file)
@@ -37,49 +37,49 @@ entity MapInfo_Type_last;
 #define IS_GAMETYPE(NAME) \
        (MapInfo_LoadedGametype == MAPINFO_TYPE_##NAME)
 
-REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,FALSE,"timelimit=20 pointlimit=30 leadlimit=0",_("Kill all enemies"));
+REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,false,"timelimit=20 pointlimit=30 leadlimit=0",_("Kill all enemies"));
 #define g_dm IS_GAMETYPE(DEATHMATCH)
 
-REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,FALSE,"timelimit=20 lives=9 leadlimit=0",_("Survive and kill until the enemies have no lives left"));
+REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,false,"timelimit=20 lives=9 leadlimit=0",_("Survive and kill until the enemies have no lives left"));
 #define g_lms IS_GAMETYPE(LMS)
 
-REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,FALSE,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0",_("Race against other players to the finish line"));
+REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,false,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0",_("Race against other players to the finish line"));
 #define g_race IS_GAMETYPE(RACE)
 
-REGISTER_GAMETYPE(_("Race CTS"),cts,g_cts,CTS,FALSE,"timelimit=20 skill=-1",_("Race for fastest time"));
+REGISTER_GAMETYPE(_("Race CTS"),cts,g_cts,CTS,false,"timelimit=20 skill=-1",_("Race for fastest time"));
 #define g_cts IS_GAMETYPE(CTS)
 
-REGISTER_GAMETYPE(_("Team Deathmatch"),tdm,g_tdm,TEAM_DEATHMATCH,TRUE,"timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Kill all enemy teammates"));
+REGISTER_GAMETYPE(_("Team Deathmatch"),tdm,g_tdm,TEAM_DEATHMATCH,true,"timelimit=20 pointlimit=50 teams=2 leadlimit=0",_("Kill all enemy teammates"));
 #define g_tdm IS_GAMETYPE(TEAM_DEATHMATCH)
 
-REGISTER_GAMETYPE(_("Capture the Flag"),ctf,g_ctf,CTF,TRUE,"timelimit=20 caplimit=10 leadlimit=6",_("Find and bring the enemy flag to your base to capture it"));
+REGISTER_GAMETYPE(_("Capture the Flag"),ctf,g_ctf,CTF,true,"timelimit=20 caplimit=10 leadlimit=6",_("Find and bring the enemy flag to your base to capture it"));
 #define g_ctf IS_GAMETYPE(CTF)
 
-REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,TRUE,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round"));
+REGISTER_GAMETYPE(_("Clan Arena"),ca,g_ca,CA,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill all enemy teammates to win the round"));
 #define g_ca IS_GAMETYPE(CA)
 
-REGISTER_GAMETYPE(_("Domination"),dom,g_domination,DOMINATION,TRUE,"timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture all the control points to win"));
+REGISTER_GAMETYPE(_("Domination"),dom,g_domination,DOMINATION,true,"timelimit=20 pointlimit=200 teams=2 leadlimit=0",_("Capture all the control points to win"));
 #define g_domination IS_GAMETYPE(DOMINATION)
 
-REGISTER_GAMETYPE(_("Key Hunt"),kh,g_keyhunt,KEYHUNT,TRUE,"timelimit=20 pointlimit=1000 teams=3 leadlimit=0",_("Gather all the keys to win the round"));
+REGISTER_GAMETYPE(_("Key Hunt"),kh,g_keyhunt,KEYHUNT,true,"timelimit=20 pointlimit=1000 teams=3 leadlimit=0",_("Gather all the keys to win the round"));
 #define g_keyhunt IS_GAMETYPE(KEYHUNT)
 
-REGISTER_GAMETYPE(_("Assault"),as,g_assault,ASSAULT,TRUE,"timelimit=20",_("Destroy obstacles to find and destroy the enemy power core before time runs out"));
+REGISTER_GAMETYPE(_("Assault"),as,g_assault,ASSAULT,true,"timelimit=20",_("Destroy obstacles to find and destroy the enemy power core before time runs out"));
 #define g_assault IS_GAMETYPE(ASSAULT)
 
-REGISTER_GAMETYPE(_("Onslaught"),ons,g_onslaught,ONSLAUGHT,TRUE,"timelimit=20",_("Capture control points to reach and destroy the enemy generator"));
+REGISTER_GAMETYPE(_("Onslaught"),ons,g_onslaught,ONSLAUGHT,true,"timelimit=20",_("Capture control points to reach and destroy the enemy generator"));
 #define g_onslaught IS_GAMETYPE(ONSLAUGHT)
 
-REGISTER_GAMETYPE(_("Nexball"),nb,g_nexball,NEXBALL,TRUE,"timelimit=20 pointlimit=5 leadlimit=0",_("XonSports"));
+REGISTER_GAMETYPE(_("Nexball"),nb,g_nexball,NEXBALL,true,"timelimit=20 pointlimit=5 leadlimit=0",_("XonSports"));
 #define g_nexball IS_GAMETYPE(NEXBALL)
 
-REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,TRUE,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill enemies to freeze them, stand next to teammates to revive them"));
+REGISTER_GAMETYPE(_("Freeze Tag"),ft,g_freezetag,FREEZETAG,true,"timelimit=20 pointlimit=10 teams=2 leadlimit=0",_("Kill enemies to freeze them, stand next to teammates to revive them"));
 #define g_freezetag IS_GAMETYPE(FREEZETAG)
 
-REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,TRUE,"timelimit=20 pointlimit=30",_("Hold the ball to get points for kills"));
+REGISTER_GAMETYPE(_("Keepaway"),ka,g_keepaway,KEEPAWAY,true,"timelimit=20 pointlimit=30",_("Hold the ball to get points for kills"));
 #define g_keepaway IS_GAMETYPE(KEEPAWAY)
 
-REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,FALSE,"pointlimit=50 teams=0",_("Survive against waves of monsters"));
+REGISTER_GAMETYPE(_("Invasion"),inv,g_invasion,INVASION,false,"pointlimit=50 teams=0",_("Survive against waves of monsters"));
 #define g_invasion IS_GAMETYPE(INVASION)
 
 const int MAPINFO_FEATURE_WEAPONS       = 1; // not defined for instagib-only maps
index 3adc59a..1aab262 100644 (file)
@@ -55,17 +55,17 @@ void() mage_shield;
 float friend_needshelp(entity e)
 {
        if(e == world)
-               return FALSE;
+               return false;
        if(e.health <= 0)
-               return FALSE;
+               return false;
        if(DIFF_TEAM(e, self) && e != self.monster_owner)
-               return FALSE;
+               return false;
        if(e.frozen)
-               return FALSE;
+               return false;
        if(!IS_PLAYER(e))
                return ((e.flags & FL_MONSTER) && e.health < e.max_health);
        if(e.items & IT_INVINCIBLE)
-               return FALSE;
+               return false;
 
        switch(self.skin)
        {
@@ -75,7 +75,7 @@ float friend_needshelp(entity e)
                case 3: return (e.health > 0);
        }
 
-       return FALSE;
+       return false;
 }
 
 void mage_spike_explode()
@@ -139,9 +139,9 @@ void mage_spike_think()
                {
                        // Is it a better idea (shorter distance) to trace to the target itself?
                        if ( vlen(self.origin + olddir * self.wait) < dist)
-                               traceline(self.origin, self.origin + olddir * self.wait, FALSE, self);
+                               traceline(self.origin, self.origin + olddir * self.wait, false, self);
                        else
-                               traceline(self.origin, eorg, FALSE, self);
+                               traceline(self.origin, eorg, false, self);
 
                        // Setup adaptive tracelength
                        self.wait = bound((autocvar_g_monster_mage_attack_spike_smart_trace_min), vlen(self.origin - trace_endpos), self.wait = (autocvar_g_monster_mage_attack_spike_smart_trace_max));
@@ -187,17 +187,17 @@ void mage_attack_spike()
 
        self.mage_spike = missile;
 
-       CSQCProjectile(missile, TRUE, PROJECTILE_MAGE_SPIKE, TRUE);
+       CSQCProjectile(missile, true, PROJECTILE_MAGE_SPIKE, true);
 }
 
 void mage_heal()
 {
        entity head;
-       float washealed = FALSE;
+       float washealed = false;
 
        for(head = findradius(self.origin, (autocvar_g_monster_mage_heal_range)); head; head = head.chain) if(friend_needshelp(head))
        {
-               washealed = TRUE;
+               washealed = true;
                string fx = "";
                if(IS_PLAYER(head))
                {
@@ -300,10 +300,10 @@ float mage_attack(float attack_type)
                        if(random() <= 0.7)
                        {
                                mage_push();
-                               return TRUE;
+                               return true;
                        }
 
-                       return FALSE;
+                       return false;
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -312,25 +312,25 @@ float mage_attack(float attack_type)
                                if(random() <= 0.4)
                                {
                                        mage_teleport();
-                                       return TRUE;
+                                       return true;
                                }
                                else
                                {
                                        self.frame = mage_anim_attack;
                                        self.attack_finished_single = time + (autocvar_g_monster_mage_attack_spike_delay);
                                        defer(0.2, mage_attack_spike);
-                                       return TRUE;
+                                       return true;
                                }
                        }
 
                        if(self.mage_spike)
-                               return TRUE;
+                               return true;
                        else
-                               return FALSE;
+                               return false;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_mage()
@@ -350,13 +350,13 @@ float m_mage(float req)
                case MR_THINK:
                {
                        entity head;
-                       float need_help = FALSE;
+                       float need_help = false;
 
                        for(head = findradius(self.origin, (autocvar_g_monster_mage_heal_range)); head; head = head.chain)
                        if(head != self)
                        if(friend_needshelp(head))
                        {
-                               need_help = TRUE;
+                               need_help = true;
                                break;
                        }
 
@@ -375,12 +375,12 @@ float m_mage(float req)
                                mage_shield();
 
                        monster_move((autocvar_g_monster_mage_speed_run), (autocvar_g_monster_mage_speed_walk), (autocvar_g_monster_mage_speed_stop), mage_anim_walk, mage_anim_run, mage_anim_idle);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.frame = mage_anim_death;
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -390,18 +390,18 @@ float m_mage(float req)
                        self.monster_attackfunc = mage_attack;
                        self.frame = mage_anim_walk;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/mage.dpm");
                        precache_sound ("weapons/grenade_impact.wav");
                        precache_sound ("weapons/tagexp1.wav");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -412,11 +412,11 @@ float m_mage(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index 17f75c2..12ff5dc 100644 (file)
@@ -51,7 +51,7 @@ void shambler_smash()
 void shambler_swing()
 {
        float r = (random() < 0.5);
-       monster_melee(self.enemy, (autocvar_g_monster_shambler_attack_claw_damage), ((r) ? shambler_anim_swingr : shambler_anim_swingl), self.attack_range, 0.8, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
+       monster_melee(self.enemy, (autocvar_g_monster_shambler_attack_claw_damage), ((r) ? shambler_anim_swingr : shambler_anim_swingl), self.attack_range, 0.8, DEATH_MONSTER_SHAMBLER_CLAW, true);
        if(r)
        {
                defer(0.5, shambler_swing);
@@ -127,7 +127,7 @@ void shambler_lightning()
        gren = spawn ();
        gren.owner = gren.realowner = self;
        gren.classname = "grenade";
-       gren.bot_dodge = TRUE;
+       gren.bot_dodge = true;
        gren.bot_dodgerating = (autocvar_g_monster_shambler_attack_lightning_damage);
        gren.movetype = MOVETYPE_BOUNCE;
        PROJECTILE_MAKETRIGGER(gren);
@@ -146,14 +146,14 @@ void shambler_lightning()
        gren.health = 50;
        gren.damageforcescale = 0;
        gren.event_damage = shambler_lightning_damage;
-       gren.damagedbycontents = TRUE;
+       gren.damagedbycontents = true;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
-       W_SetupProjVelocity_Explicit(gren, v_forward, v_up, (autocvar_g_monster_shambler_attack_lightning_speed), (autocvar_g_monster_shambler_attack_lightning_speed_up), 0, 0, FALSE);
+       W_SetupProjVelocity_Explicit(gren, v_forward, v_up, (autocvar_g_monster_shambler_attack_lightning_speed), (autocvar_g_monster_shambler_attack_lightning_speed_up), 0, 0, false);
 
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
 
-       CSQCProjectile(gren, TRUE, PROJECTILE_SHAMBLER_LIGHTNING, TRUE);
+       CSQCProjectile(gren, true, PROJECTILE_SHAMBLER_LIGHTNING, true);
 }
 
 float shambler_attack(float attack_type)
@@ -163,7 +163,7 @@ float shambler_attack(float attack_type)
                case MONSTER_ATTACK_MELEE:
                {
                        shambler_swing();
-                       return TRUE;
+                       return true;
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -175,7 +175,7 @@ float shambler_attack(float attack_type)
                                defer(0.7, shambler_smash);
                                self.attack_finished_single = time + 1.1;
                                self.shambler_lastattack = time + 3;
-                               return TRUE;
+                               return true;
                        }
                        else if(random() <= 0.1) // small chance, don't want this spammed
                        {
@@ -183,14 +183,14 @@ float shambler_attack(float attack_type)
                                self.attack_finished_single = time + 1.1;
                                self.shambler_lastattack = time + 3;
                                defer(0.6, shambler_lightning);
-                               return TRUE;
+                               return true;
                        }
 
-                       return FALSE;
+                       return false;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_shambler()
@@ -207,12 +207,12 @@ float m_shambler(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_shambler_speed_run), (autocvar_g_monster_shambler_speed_walk), (autocvar_g_monster_shambler_speed_stop), shambler_anim_run, shambler_anim_walk, shambler_anim_stand);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.frame = shambler_anim_death;
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -224,16 +224,16 @@ float m_shambler(float req)
                        self.frame = shambler_anim_stand;
                        self.weapon = WEP_VORTEX;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/shambler.mdl");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -244,11 +244,11 @@ float m_shambler(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index c6c4545..427f631 100644 (file)
@@ -62,7 +62,7 @@ void spider_shootweb()
        proj.owner = proj.realowner = self;
        proj.use = spider_web_touch;
        proj.think = adaptor_think2use_hittype_splash;
-       proj.bot_dodge = TRUE;
+       proj.bot_dodge = true;
        proj.bot_dodgerating = 0;
        proj.nextthink = time + 5;
        PROJECTILE_MAKETRIGGER(proj);
@@ -72,7 +72,7 @@ void spider_shootweb()
        //proj.glow_size = 50;
        //proj.glow_color = 45;
        proj.movetype = MOVETYPE_BOUNCE;
-       W_SetupProjVelocity_Explicit(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, FALSE);
+       W_SetupProjVelocity_Explicit(proj, v_forward, v_up, (autocvar_g_monster_spider_attack_web_speed), (autocvar_g_monster_spider_attack_web_speed_up), 0, 0, false);
        proj.touch = spider_web_touch;
        setsize(proj, '-4 -4 -4', '4 4 4');
        proj.takedamage = DAMAGE_NO;
@@ -80,13 +80,13 @@ void spider_shootweb()
        proj.health = 500;
        proj.event_damage = func_null;
        proj.flags = FL_PROJECTILE;
-       proj.damagedbycontents = TRUE;
+       proj.damagedbycontents = true;
 
        proj.bouncefactor = 0.3;
        proj.bouncestop = 0.05;
        proj.missile_flags = MIF_SPLASH | MIF_ARC;
 
-       CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, TRUE);
+       CSQCProjectile(proj, true, PROJECTILE_ELECTRO, true);
 }
 
 float spider_attack(float attack_type)
@@ -95,7 +95,7 @@ float spider_attack(float attack_type)
        {
                case MONSTER_ATTACK_MELEE:
                {
-                       return monster_melee(self.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, TRUE);
+                       return monster_melee(self.enemy, (autocvar_g_monster_spider_attack_bite_damage), ((random() > 0.5) ? spider_anim_attack : spider_anim_attack2), self.attack_range, (autocvar_g_monster_spider_attack_bite_delay), DEATH_MONSTER_SPIDER, true);
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -105,14 +105,14 @@ float spider_attack(float attack_type)
                                self.attack_finished_single = time + (autocvar_g_monster_spider_attack_web_delay);
                                spider_shootweb();
                                self.spider_web_delay = time + 3;
-                               return TRUE;
+                               return true;
                        }
 
-                       return FALSE;
+                       return false;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_spider()
@@ -129,13 +129,13 @@ float m_spider(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_spider_speed_run), (autocvar_g_monster_spider_speed_walk), (autocvar_g_monster_spider_speed_stop), spider_anim_walk, spider_anim_walk, spider_anim_idle);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.frame = spider_anim_attack;
                        self.angles_x = 180;
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -145,17 +145,17 @@ float m_spider(float req)
                        self.monster_attackfunc = spider_attack;
                        self.frame = spider_anim_idle;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/spider.dpm");
                        precache_sound ("weapons/electro_fire2.wav");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -166,11 +166,11 @@ float m_spider(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index a44f6d9..b6736ca 100644 (file)
@@ -71,7 +71,7 @@ void wyvern_fireball()
        missile.think = wyvern_fireball_explode;
        missile.enemy = self.enemy;
        missile.touch = wyvern_fireball_touch;
-       CSQCProjectile(missile, TRUE, PROJECTILE_FIREMINE, TRUE);
+       CSQCProjectile(missile, true, PROJECTILE_FIREMINE, true);
 }
 
 float wyvern_attack(float attack_type)
@@ -85,11 +85,11 @@ float wyvern_attack(float attack_type)
 
                        wyvern_fireball();
 
-                       return TRUE;
+                       return true;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_wyvern()
@@ -109,7 +109,7 @@ float m_wyvern(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_wyvern_speed_run), (autocvar_g_monster_wyvern_speed_walk), (autocvar_g_monster_wyvern_speed_stop), wyvern_anim_fly, wyvern_anim_hover, wyvern_anim_hover);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
@@ -117,7 +117,7 @@ float m_wyvern(float req)
                        self.velocity_x = -200 + 400 * random();
                        self.velocity_y = -200 + 400 * random();
                        self.velocity_z = 100 + 100 * random();
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -127,16 +127,16 @@ float m_wyvern(float req)
                        self.monster_attackfunc = wyvern_attack;
                        self.frame = wyvern_anim_hover;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/wizard.mdl");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -147,11 +147,11 @@ float m_wyvern(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index 25afaf7..411e1c6 100644 (file)
@@ -93,7 +93,7 @@ float zombie_block()
 
        defer(2, zombie_blockend);
 
-       return TRUE;
+       return true;
 }
 
 float zombie_attack(float attack_type)
@@ -114,7 +114,7 @@ float zombie_attack(float attack_type)
                        if(random() < 0.3 && self.health < 75 && self.enemy.health > 10)
                                return zombie_block();
 
-                       return monster_melee(self.enemy, (autocvar_g_monster_zombie_attack_melee_damage), chosen_anim, self.attack_range, (autocvar_g_monster_zombie_attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, TRUE);
+                       return monster_melee(self.enemy, (autocvar_g_monster_zombie_attack_melee_damage), chosen_anim, self.attack_range, (autocvar_g_monster_zombie_attack_melee_delay), DEATH_MONSTER_ZOMBIE_MELEE, true);
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -123,7 +123,7 @@ float zombie_attack(float attack_type)
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_zombie()
@@ -140,14 +140,14 @@ float m_zombie(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_zombie_speed_run), (autocvar_g_monster_zombie_speed_walk), (autocvar_g_monster_zombie_speed_stop), zombie_anim_runforward, zombie_anim_runforward, zombie_anim_idle);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.armorvalue = 0;
                        self.m_armor_blockpercent = autocvar_g_monsters_armor_blockpercent;
                        self.frame = ((random() > 0.5) ? zombie_anim_deathback1 : zombie_anim_deathfront1);
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -165,16 +165,16 @@ float m_zombie(float req)
                        self.spawnshieldtime = self.spawn_time;
                        self.respawntime = 0.2;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/zombie.dpm");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -185,11 +185,11 @@ float m_zombie(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
index be5accf..e6b5db8 100644 (file)
@@ -34,7 +34,7 @@ entity spawnmonster (string monster, float monster_id, entity spawnedby, entity
                        mon = get_monsterinfo(i);
                        if(mon.netname == monster)
                        {
-                               found = TRUE;
+                               found = true;
                                monster_id = mon.monsterid; // we have the monster, old monster id is no longer required
                                break;
                        }
index b8c47d0..d5cd1f3 100644 (file)
@@ -20,7 +20,7 @@ void monster_dropitem()
        if(e && e.monster_loot)
        {
                self = e;
-               e.noalign = TRUE;
+               e.noalign = true;
                e.monster_loot();
                e.gravity = 1;
                e.movetype = MOVETYPE_TOSS;
@@ -44,58 +44,58 @@ float Monster_SkillModifier()
 float monster_isvalidtarget (entity targ, entity ent)
 {
        if(!targ || !ent)
-               return FALSE; // someone doesn't exist
+               return false; // someone doesn't exist
 
        if(targ == ent)
-               return FALSE; // don't attack ourselves
+               return false; // don't attack ourselves
 
        //traceline(ent.origin, targ.origin, MOVE_NORMAL, ent);
 
        //if(trace_ent != targ)
-               //return FALSE;
+               //return false;
 
        if(targ.vehicle_flags & VHF_ISVEHICLE)
        if(!((get_monsterinfo(ent.monsterid)).spawnflags & MON_FLAG_RANGED))
-               return FALSE; // melee attacks are useless against vehicles
+               return false; // melee attacks are useless against vehicles
 
        if(time < game_starttime)
-               return FALSE; // monsters do nothing before the match has started
+               return false; // monsters do nothing before the match has started
 
        if(targ.takedamage == DAMAGE_NO)
-               return FALSE; // enemy can't be damaged
+               return false; // enemy can't be damaged
 
        if(targ.items & IT_INVISIBILITY)
-               return FALSE; // enemy is invisible
+               return false; // enemy is invisible
 
        if(substring(targ.classname, 0, 10) == "onslaught_")
-               return FALSE; // don't attack onslaught targets
+               return false; // don't attack onslaught targets
 
        if(IS_SPEC(targ) || IS_OBSERVER(targ))
-               return FALSE; // enemy is a spectator
+               return false; // enemy is a spectator
 
        if(!(targ.vehicle_flags & VHF_ISVEHICLE))
        if(targ.deadflag != DEAD_NO || ent.deadflag != DEAD_NO || targ.health <= 0 || ent.health <= 0)
-               return FALSE; // enemy/self is dead
+               return false; // enemy/self is dead
 
        if(ent.monster_owner == targ)
-               return FALSE; // don't attack our master
+               return false; // don't attack our master
 
        if(targ.monster_owner == ent)
-               return FALSE; // don't attack our pet
+               return false; // don't attack our pet
 
        if(!(targ.vehicle_flags & VHF_ISVEHICLE))
        if(targ.flags & FL_NOTARGET)
-               return FALSE; // enemy can't be targeted
+               return false; // enemy can't be targeted
 
        if(!autocvar_g_monsters_typefrag)
        if(targ.BUTTON_CHAT)
-               return FALSE; // no typefragging!
+               return false; // no typefragging!
 
        if(SAME_TEAM(targ, ent))
-               return FALSE; // enemy is on our team
+               return false; // enemy is on our team
 
        if (targ.frozen)
-               return FALSE; // ignore frozen
+               return false; // ignore frozen
 
        if(autocvar_g_monsters_target_infront || (ent.spawnflags & MONSTERFLAG_INFRONT))
        if(ent.enemy != targ)
@@ -106,10 +106,10 @@ float monster_isvalidtarget (entity targ, entity ent)
                dot = normalize (targ.origin - ent.origin) * v_forward;
 
                if(dot <= 0.3)
-                       return FALSE;
+                       return false;
        }
 
-       return TRUE;
+       return true;
 }
 
 entity FindTarget (entity ent)
@@ -118,7 +118,7 @@ entity FindTarget (entity ent)
 
        entity head, closest_target = world;
        head = findradius(ent.origin, ent.target_range);
-       //head = WarpZone_FindRadius(ent.origin, ent.target_range, TRUE);
+       //head = WarpZone_FindRadius(ent.origin, ent.target_range, true);
 
        while(head) // find the closest acceptable target to pass to
        {
@@ -198,7 +198,7 @@ void precache_monstersounds()
        float globhandle, n, i;
        string f;
 
-       globhandle = search_begin(strcat(m, "_*.sounds"), TRUE, FALSE);
+       globhandle = search_begin(strcat(m, "_*.sounds"), true, false);
        if (globhandle < 0)
                return;
        n = search_getsize(globhandle);
@@ -298,7 +298,7 @@ void monster_makevectors(entity e)
 float monster_melee(entity targ, float damg, float anim, float er, float anim_finished, float deathtype, float dostop)
 {
        if (self.health <= 0)
-               return FALSE; // attacking while dead?!
+               return false; // attacking while dead?!
 
        if(dostop)
        {
@@ -319,7 +319,7 @@ float monster_melee(entity targ, float damg, float anim, float er, float anim_fi
        if(trace_ent.takedamage)
                Damage(trace_ent, self, self, damg * Monster_SkillModifier(), deathtype, trace_ent.origin, normalize(trace_ent.origin - self.origin));
 
-       return TRUE;
+       return true;
 }
 
 void Monster_CheckMinibossFlag ()
@@ -344,15 +344,15 @@ float Monster_CanRespawn(entity ent)
        other = ent;
        if(ent.deadflag == DEAD_DEAD) // don't call when monster isn't dead
        if(MUTATOR_CALLHOOK(MonsterRespawn))
-               return TRUE; // enabled by a mutator
+               return true; // enabled by a mutator
 
        if(ent.spawnflags & MONSTERFLAG_NORESPAWN)
-               return FALSE;
+               return false;
 
        if(!autocvar_g_monsters_respawn)
-               return FALSE;
+               return false;
 
-       return TRUE;
+       return true;
 }
 
 float monster_initialize(float mon_id);
@@ -395,13 +395,13 @@ void Monster_Fade ()
 float Monster_CanJump (vector vel)
 {
        if(self.state)
-               return FALSE; // already attacking
+               return false; // already attacking
        if(!(self.flags & FL_ONGROUND))
-               return FALSE; // not on the ground
+               return false; // not on the ground
        if(self.health <= 0)
-               return FALSE; // called when dead?
+               return false; // called when dead?
        if(time < self.attack_finished_single)
-               return FALSE; // still attacking
+               return false; // still attacking
 
        vector old = self.velocity;
 
@@ -409,15 +409,15 @@ float Monster_CanJump (vector vel)
        tracetoss(self, self);
        self.velocity = old;
        if (trace_ent != self.enemy)
-               return FALSE;
+               return false;
 
-       return TRUE;
+       return true;
 }
 
 float monster_leap (float anm, void() touchfunc, vector vel, float anim_finished)
 {
        if(!Monster_CanJump(vel))
-               return FALSE;
+               return false;
 
        self.frame = anm;
        self.state = MONSTER_STATE_ATTACK_LEAP;
@@ -428,7 +428,7 @@ float monster_leap (float anm, void() touchfunc, vector vel, float anim_finished
 
        self.attack_finished_single = time + anim_finished;
 
-       return TRUE;
+       return true;
 }
 
 void monster_checkattack(entity e, entity targ)
@@ -447,14 +447,14 @@ void monster_checkattack(entity e, entity targ)
        if(vlen(targ.origin - e.origin) <= e.attack_range)
        if(e.monster_attackfunc(MONSTER_ATTACK_MELEE))
        {
-               MonsterSound(monstersound_melee, 0, FALSE, CH_VOICE);
+               MonsterSound(monstersound_melee, 0, false, CH_VOICE);
                return;
        }
 
        if(vlen(targ.origin - e.origin) > e.attack_range)
        if(e.monster_attackfunc(MONSTER_ATTACK_RANGED))
        {
-               MonsterSound(monstersound_ranged, 0, FALSE, CH_VOICE);
+               MonsterSound(monstersound_ranged, 0, false, CH_VOICE);
                return;
        }
 }
@@ -656,7 +656,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                {
                        if(time >= self.last_trace)
                        {
-                               self.fish_wasdrowning = TRUE;
+                               self.fish_wasdrowning = true;
                                self.last_trace = time + 0.4;
 
                                Damage (self, world, world, 2, DEATH_DROWN, self.origin, '0 0 0');
@@ -682,7 +682,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                }
                else if(self.fish_wasdrowning)
                {
-                       self.fish_wasdrowning = FALSE;
+                       self.fish_wasdrowning = false;
                        self.angles_x = 0;
                        self.movetype = MOVETYPE_WALK;
                }
@@ -730,7 +730,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                                self.moveto = WarpZone_RefSys_TransformOrigin(self.enemy, self, (0.5 * (self.enemy.absmin + self.enemy.absmax)));
                                
                                self.pass_distance = vlen((('1 0 0' * self.enemy.origin.x) + ('0 1 0' * self.enemy.origin.y)) - (('1 0 0' *  self.origin.x) + ('0 1 0' *  self.origin.y)));
-                               MonsterSound(monstersound_sight, 0, FALSE, CH_VOICE);
+                               MonsterSound(monstersound_sight, 0, false, CH_VOICE);
                        }
                }
 
@@ -745,7 +745,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                self.moveto = monster_pickmovetarget(targ);
 
        if(!self.enemy)
-               MonsterSound(monstersound_idle, 7, TRUE, CH_VOICE);
+               MonsterSound(monstersound_idle, 7, true, CH_VOICE);
 
        if(self.state == MONSTER_STATE_ATTACK_LEAP && (self.flags & FL_ONGROUND))
        {
@@ -767,7 +767,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
        if(vlen(self.origin - self.moveto) > 64)
        {
                if((self.flags & FL_ONGROUND) || ((self.flags & FL_FLY) || (self.flags & FL_SWIM)))
-                       monster_CalculateVelocity(self, self.moveto, self.origin, TRUE, ((self.enemy) ? runspeed : walkspeed));
+                       monster_CalculateVelocity(self, self.moveto, self.origin, true, ((self.enemy) ? runspeed : walkspeed));
                
                /*&if(self.flags & FL_FLY || self.flags & FL_SWIM)
                        movelib_move_simple(v_forward, ((self.enemy) ? runspeed : walkspeed), 0.6);
@@ -859,7 +859,7 @@ void Monster_Appear()
 float Monster_CheckAppearFlags(entity ent, float monster_id)
 {
        if(!(ent.spawnflags & MONSTERFLAG_APPEAR))
-               return FALSE;
+               return false;
 
        ent.think = func_null;
        ent.monsterid = monster_id; // set so this monster is properly registered (otherwise, normal initialization is used)
@@ -867,7 +867,7 @@ float Monster_CheckAppearFlags(entity ent, float monster_id)
        ent.use = Monster_Appear;
        ent.flags = FL_MONSTER; // set so this monster can get butchered
 
-       return TRUE;
+       return true;
 }
 
 void monsters_reset()
@@ -918,7 +918,7 @@ void monster_die(entity attacker, float gibbed)
 
        monster_dropitem();
 
-       MonsterSound(monstersound_death, 0, FALSE, CH_VOICE);
+       MonsterSound(monstersound_death, 0, false, CH_VOICE);
 
        if(!(self.spawnflags & MONSTERFLAG_SPAWNED) && !(self.spawnflags & MONSTERFLAG_RESPAWNED))
                monsters_killed += 1;
@@ -1001,7 +1001,7 @@ void monsters_damage (entity inflictor, entity attacker, float damage, float dea
        if(self.health <= 0)
        {
                if(deathtype == DEATH_KILL)
-                       self.candrop = FALSE; // killed by mobkill command
+                       self.candrop = false; // killed by mobkill command
 
                // TODO: fix this?
                activator = attacker;
@@ -1055,7 +1055,7 @@ void monster_changeteam(entity ent, float newteam)
        if(!teamplay) { return; }
        
        ent.team = newteam;
-       ent.monster_attack = TRUE; // new team, activate attacking
+       ent.monster_attack = true; // new team, activate attacking
        monster_setupcolors(ent);
        
        if(ent.sprite)
@@ -1114,11 +1114,11 @@ float monster_spawn()
        UpdateMonsterSounds();
 
        if(teamplay)
-               self.monster_attack = TRUE; // we can have monster enemies in team games
+               self.monster_attack = true; // we can have monster enemies in team games
 
-       MonsterSound(monstersound_spawn, 0, FALSE, CH_VOICE);
+       MonsterSound(monstersound_spawn, 0, false, CH_VOICE);
 
-       WaypointSprite_Spawn(M_NAME(self.monsterid), 0, 1024, self, '0 0 1' * (self.maxs.z + 15), world, self.team, self, sprite, TRUE, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));
+       WaypointSprite_Spawn(M_NAME(self.monsterid), 0, 1024, self, '0 0 1' * (self.maxs.z + 15), world, self.team, self, sprite, true, RADARICON_DANGER, ((self.team) ? Team_ColorRGB(self.team) : '1 0 0'));
        if(!(self.spawnflags & MONSTERFLAG_INVINCIBLE))
        {
                WaypointSprite_UpdateMaxHealth(self.sprite, self.max_health);
@@ -1129,16 +1129,16 @@ float monster_spawn()
        self.nextthink = time + self.ticrate;
 
        if(MUTATOR_CALLHOOK(MonsterSpawn))
-               return FALSE;
+               return false;
 
-       return TRUE;
+       return true;
 }
 
 float monster_initialize(float mon_id)
 {
-       if(!autocvar_g_monsters) { return FALSE; }
+       if(!autocvar_g_monsters) { return false; }
        if(!(self.spawnflags & MONSTERFLAG_RESPAWNED)) { MON_ACTION(mon_id, MR_PRECACHE); }
-       if(Monster_CheckAppearFlags(self, mon_id)) { return TRUE; } // return true so the monster isn't removed
+       if(Monster_CheckAppearFlags(self, mon_id)) { return true; } // return true so the monster isn't removed
 
        entity mon = get_monsterinfo(mon_id);
 
@@ -1146,9 +1146,9 @@ float monster_initialize(float mon_id)
                self.monster_skill = cvar("g_monsters_skill");
 
        // support for quake style removing monsters based on skill
-       if(self.monster_skill == MONSTER_SKILL_EASY) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return FALSE; }
-       if(self.monster_skill == MONSTER_SKILL_MEDIUM) if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) { return FALSE; }
-       if(self.monster_skill == MONSTER_SKILL_HARD) if(self.spawnflags & MONSTERSKILL_NOTHARD) { return FALSE; }
+       if(self.monster_skill == MONSTER_SKILL_EASY) if(self.spawnflags & MONSTERSKILL_NOTEASY) { return false; }
+       if(self.monster_skill == MONSTER_SKILL_MEDIUM) if(self.spawnflags & MONSTERSKILL_NOTMEDIUM) { return false; }
+       if(self.monster_skill == MONSTER_SKILL_HARD) if(self.spawnflags & MONSTERSKILL_NOTHARD) { return false; }
 
        if(self.team && !teamplay)
                self.team = 0;
@@ -1161,10 +1161,10 @@ float monster_initialize(float mon_id)
        //setsize(self, mon.mins, mon.maxs);
        self.flags                              = FL_MONSTER;
        self.takedamage                 = DAMAGE_AIM;
-       self.bot_attack                 = TRUE;
-       self.iscreature                 = TRUE;
-       self.teleportable               = TRUE;
-       self.damagedbycontents  = TRUE;
+       self.bot_attack                 = true;
+       self.iscreature                 = true;
+       self.teleportable               = true;
+       self.damagedbycontents  = true;
        self.monsterid                  = mon_id;
        self.damageforcescale   = 0;
        self.event_damage               = monsters_damage;
@@ -1181,7 +1181,7 @@ float monster_initialize(float mon_id)
        self.reset                              = monsters_reset;
        self.netname                    = mon.netname;
        self.monster_name               = M_NAME(mon_id);
-       self.candrop                    = TRUE;
+       self.candrop                    = true;
        self.view_ofs                   = '0 0 1' * (self.maxs.z * 0.5);
        self.oldtarget2                 = self.target2;
        self.pass_distance              = 0;
@@ -1244,12 +1244,12 @@ float monster_initialize(float mon_id)
        }
 
        if(!monster_spawn())
-               return FALSE;
+               return false;
 
        if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
                monster_setupcolors(self);
 
        CSQCMODEL_AUTOINIT();
 
-       return TRUE;
+       return true;
 }
index 5d67ef3..e0d5cbc 100644 (file)
@@ -20,7 +20,7 @@ float healer_send(entity to, float sf)
                WriteByte(MSG_ENTITY, (self.ltime - time)*10.0+0.5);
        }
 
-       return TRUE;
+       return true;
 }
 #endif // SVQC
 
index caaae8b..084c83c 100644 (file)
@@ -7,7 +7,7 @@ void sv_notice_join_think()
     {
         float i;
         for(i = argc - 1; i >= 0; --i)
-            sv_notice_to(self.owner, argv(i), autocvar_sv_join_notices_time, FALSE);
+            sv_notice_to(self.owner, argv(i), autocvar_sv_join_notices_time, false);
     }
     remove(self);
 }
@@ -64,11 +64,11 @@ float cl_notice_run()
 {
     entity _notes;
     string _notice;
-    float m = FALSE;
+    float m = false;
 
     _notes = findchain(classname, "sv_notice");
     if(!_notes)
-        return FALSE;
+        return false;
     #define M1 30
     #define M2 10
 
@@ -96,7 +96,7 @@ float cl_notice_run()
         OUT(_notice, 16);
 
         if(_notes.skin)
-            m = TRUE;
+            m = true;
 
         if(_notes.alpha <= time)
         {
index 5bb9fcd..dbe01f4 100644 (file)
@@ -139,12 +139,12 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
                                        &&
                                        (to_client.enemy == other_client)
                                )
-                       ) { return TRUE; }
+                       ) { return true; }
                        break;
                }
                case NOTIF_ONE_ONLY: // send ONLY to one client
                {
-                       if(to_client == other_client) { return TRUE; }
+                       if(to_client == other_client) { return true; }
                        break;
                }
                case NOTIF_TEAM: // send only to X team and their spectators
@@ -157,7 +157,7 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
                                        &&
                                        (to_client.enemy.team == other_client.team)
                                )
-                       ) { return TRUE; }
+                       ) { return true; }
                        break;
                }
                case NOTIF_TEAM_EXCEPT: // send only to X team and their spectators, except for Y person and their spectators
@@ -178,12 +178,12 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
                                                )
                                        )
                                )
-                       ) { return TRUE; }
+                       ) { return true; }
                        break;
                }
                case NOTIF_ALL: // send to everyone
                {
-                       return TRUE;
+                       return true;
                }
                case NOTIF_ALL_EXCEPT: // send to everyone except X person and their spectators
                {
@@ -195,11 +195,11 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
                                        &&
                                        (to_client.enemy == other_client)
                                )
-                       ) { return TRUE; }
+                       ) { return true; }
                        break;
                }
        }
-       return FALSE;
+       return false;
 }
 
 #endif
@@ -290,7 +290,7 @@ string Process_Notif_Line(
                        notifname,
                        stringtype
                );
-               notif_error = TRUE;
+               notif_error = true;
                input = substring(input, 1, (strlen(input) - 1));
        }
 
@@ -325,7 +325,7 @@ string Process_Notif_Args(
                                                notifname,
                                                NOTIF_MAX_ARGS
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                        break;
                                }
 
@@ -357,7 +357,7 @@ string Process_Notif_Args(
                                                        notifname,
                                                        selected
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                                break;
                                        }
                                }
@@ -376,7 +376,7 @@ string Process_Notif_Args(
                                                notifname,
                                                NOTIF_MAX_HUDARGS
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                        break;
                                }
 
@@ -408,7 +408,7 @@ string Process_Notif_Args(
                                                        notifname,
                                                        selected
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                                break;
                                        }
                                }
@@ -427,7 +427,7 @@ string Process_Notif_Args(
                                                notifname,
                                                NOTIF_MAX_DURCNT
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                        break;
                                }
 
@@ -462,7 +462,7 @@ string Process_Notif_Args(
                                                                notifname,
                                                                selected
                                                        );
-                                                       notif_error = TRUE;
+                                                       notif_error = true;
                                                }
                                                break;
                                        }
@@ -565,7 +565,7 @@ void Create_Notification_Entity(
        string typestring = Get_Notif_TypeName(typeId);
 
        // Other pre-notif-setup requisites
-       notif_error = FALSE;
+       notif_error = false;
 
        // ====================
        //  Notification Setup
@@ -599,12 +599,12 @@ void Create_Notification_Entity(
                                                typestring,
                                                namestring
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                }
                        }
-                       else { notif.nent_enabled = FALSE; }
+                       else { notif.nent_enabled = false; }
                        #else
-                       notif.nent_enabled = FALSE;
+                       notif.nent_enabled = false;
                        #endif
 
                        break;
@@ -621,7 +621,7 @@ void Create_Notification_Entity(
                        #ifdef SVQC
                        float should_process_args = server_is_dedicated;
                        #else
-                       float should_process_args = TRUE;
+                       float should_process_args = true;
                        #endif
 
                        if(should_process_args)
@@ -648,7 +648,7 @@ void Create_Notification_Entity(
                                                        strnum,
                                                        flnum
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                        }
                                }
                                else if(args != "")
@@ -680,7 +680,7 @@ void Create_Notification_Entity(
                                                        typestring,
                                                        namestring
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                        }
                                }
                                else if(icon != "")
@@ -693,7 +693,7 @@ void Create_Notification_Entity(
                                                typestring,
                                                namestring
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                }
 
                                if(durcnt != "")
@@ -712,7 +712,7 @@ void Create_Notification_Entity(
                                                        typestring,
                                                        namestring
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                        }
                                }
                                else if(cpid != NO_MSG) { notif.nent_cpid = cpid; }
@@ -754,7 +754,7 @@ void Create_Notification_Entity(
                                                typestring,
                                                namestring
                                        );
-                                       notif_error = TRUE;
+                                       notif_error = true;
                                }
                        }
 
@@ -774,7 +774,7 @@ void Create_Notification_Entity(
                                        typestring,
                                        namestring
                                );
-                               notif_error = TRUE;
+                               notif_error = true;
                        }
                        else
                        {
@@ -818,7 +818,7 @@ void Create_Notification_Entity(
                                        typestring,
                                        namestring
                                );
-                               notif_error = TRUE;
+                               notif_error = true;
                        }
                        else
                        {
@@ -865,7 +865,7 @@ void Create_Notification_Entity(
                                                        typeId,
                                                        namestring
                                                );
-                                               notif_error = TRUE;
+                                               notif_error = true;
                                                break;
                                        }
                                }
@@ -908,7 +908,7 @@ void Create_Notification_Entity(
                                typeId,
                                namestring
                        );
-                       notif_error = TRUE;
+                       notif_error = true;
                        break;
                }
        }
@@ -916,8 +916,8 @@ void Create_Notification_Entity(
        // now check to see if any errors happened
        if(notif_error)
        {
-               notif.nent_enabled = FALSE; // disable the notification so it can't cause trouble
-               notif_global_error = TRUE; // throw the red flag that an error happened on init
+               notif.nent_enabled = false; // disable the notification so it can't cause trouble
+               notif_global_error = true; // throw the red flag that an error happened on init
        }
 }
 
@@ -1764,9 +1764,9 @@ float Net_Write_Notification(entity client, float sf)
                WriteShort(MSG_ENTITY, self.nent_net_name);
                for(i = 0; i < self.nent_stringcount; ++i) { WriteString(MSG_ENTITY, self.nent_strings[i]); }
                for(i = 0; i < self.nent_floatcount; ++i) { WriteLong(MSG_ENTITY, self.nent_floats[i]); }
-               return TRUE;
+               return true;
        }
-       else { return FALSE; }
+       else { return false; }
 }
 
 void Kill_Notification(
@@ -1831,7 +1831,7 @@ void Kill_Notification(
                net_notif.nent_client = client;
                net_notif.nent_net_type = MSG_CENTER_CPID;
                net_notif.nent_net_name = killed_cpid;
-               Net_LinkEntity(net_notif, FALSE, autocvar_notification_lifetime_runtime, Net_Write_Notification);
+               Net_LinkEntity(net_notif, false, autocvar_notification_lifetime_runtime, Net_Write_Notification);
        }
 
        for(notif = world; (notif = find(notif, classname, "net_notification"));)
@@ -2092,7 +2092,7 @@ void Send_Notification(
                                autocvar_notification_lifetime_mapload
                        );
 
-               Net_LinkEntity(net_notif, FALSE, 0, Net_Write_Notification);
+               Net_LinkEntity(net_notif, false, 0, Net_Write_Notification);
        }
 }
 
index e414ef2..71b10c4 100644 (file)
@@ -936,16 +936,16 @@ void Send_Notification_WOCOVA(
 
 #define NOTIF_ADD_AUTOCVAR(name,default) var float autocvar_notification_##name = default;
 
-var float autocvar_notification_show_location = FALSE;
+var float autocvar_notification_show_location = false;
 var string autocvar_notification_show_location_string = ""; //_(" at the %s");
-var float autocvar_notification_show_sprees = TRUE;
+var float autocvar_notification_show_sprees = true;
 var float autocvar_notification_show_sprees_info = 3; // 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker
-var float autocvar_notification_show_sprees_info_newline = TRUE;
-var float autocvar_notification_show_sprees_info_specialonly = TRUE;
-var float autocvar_notification_errors_are_fatal = TRUE;
+var float autocvar_notification_show_sprees_info_newline = true;
+var float autocvar_notification_show_sprees_info_specialonly = true;
+var float autocvar_notification_errors_are_fatal = true;
 var float autocvar_notification_lifetime_runtime = 0.5;
 var float autocvar_notification_lifetime_mapload = 10;
-var float autocvar_notification_debug = FALSE;
+var float autocvar_notification_debug = false;
 
 #ifdef SVQC
 .float FRAG_VERBOSE;
@@ -958,8 +958,8 @@ var float autocvar_notification_item_centerprinttime = 1.5;
 // DISABLED IN CODE, BUT ENABLED IN CONFIG FOR COMPATIBILITY WITH OLD CLIENTS
 var float autocvar_notification_allow_chatboxprint = 0;
 
-var float autocvar_notification_show_sprees_center = TRUE;
-var float autocvar_notification_show_sprees_center_specialonly = TRUE;
+var float autocvar_notification_show_sprees_center = true;
+var float autocvar_notification_show_sprees_center_specialonly = true;
 #endif
 
 
@@ -1054,7 +1054,7 @@ const float ARG_DC = 6; // unique result to durcnt/centerprint
     ARG_CASE(ARG_CS_SV,     "race_diff",     ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssss(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssss(f3 - f2)))) \
     ARG_CASE(ARG_CS,        "missing_teams", notif_arg_missing_teams(f1)) \
     ARG_CASE(ARG_CS,        "pass_key",      ((((tmp_s = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(tmp_s, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), tmp_s) : "")) \
-    ARG_CASE(ARG_CS,        "frag_ping",     notif_arg_frag_ping(TRUE, f2)) \
+    ARG_CASE(ARG_CS,        "frag_ping",     notif_arg_frag_ping(true, f2)) \
     ARG_CASE(ARG_CS,        "frag_stats",    notif_arg_frag_stats(f2, f3, f4)) \
     /*ARG_CASE(ARG_CS,      "frag_pos",      ((Should_Print_Score_Pos(f1)) ? sprintf("\n^BG%s", Read_Score_Pos(f1)) : ""))*/ \
     ARG_CASE(ARG_CS,        "spree_cen",     (autocvar_notification_show_sprees ? notif_arg_spree_cen(f1) : "")) \
@@ -1092,9 +1092,9 @@ string notif_arg_frag_ping(float newline, float fping)
 string notif_arg_frag_stats(float fhealth, float farmor, float fping)
 {
     if (!(fhealth < 1))
-        return sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), fhealth, farmor, notif_arg_frag_ping(FALSE, fping));
+        return sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), fhealth, farmor, notif_arg_frag_ping(false, fping));
     else
-        return sprintf(CCR(_("\n(^F4Dead^BG)%s")), notif_arg_frag_ping(FALSE, fping));
+        return sprintf(CCR(_("\n(^F4Dead^BG)%s")), notif_arg_frag_ping(false, fping));
 }
 
 string notif_arg_missing_teams(float f1)
@@ -1558,7 +1558,7 @@ float notif_global_error;
 
 void RegisterNotifications_First()
 {
-    notif_global_error = FALSE;
+    notif_global_error = false;
 
     #ifdef SVQC
     #define dedi (server_is_dedicated ? "a dedicated " : "")
@@ -1577,7 +1577,7 @@ void RegisterNotifications_First()
         #else
         if(autocvar_notification_version_mismatch_server_error)
         #endif
-            notif_global_error = TRUE;
+            notif_global_error = true;
 
         printf("^1NOTIFICATION VERSION MISMATCH: ^7program = %s, config = %d, code = %d.\n",
             PROGNAME, autocvar_notification_version, NOTIF_VERSION);
index 2c4a355..60af829 100644 (file)
@@ -191,7 +191,7 @@ void PlayerStats_GameReport(float finished)
 
        if(autocvar_g_playerstats_gamereport_uri != "")
        {
-               PlayerStats_GameReport_DelayMapVote = TRUE;
+               PlayerStats_GameReport_DelayMapVote = true;
                url_multi_fopen(
                        autocvar_g_playerstats_gamereport_uri,
                        FILE_APPEND,
@@ -201,7 +201,7 @@ void PlayerStats_GameReport(float finished)
        }
        else
        {
-               PlayerStats_GameReport_DelayMapVote = FALSE;
+               PlayerStats_GameReport_DelayMapVote = false;
                db_close(PS_GR_OUT_DB);
                PS_GR_OUT_DB = -1;
        }
@@ -215,7 +215,7 @@ void PlayerStats_GameReport_Init() // initiated before InitGameplayMode so that
 
        if(PS_GR_OUT_DB >= 0)
        {
-               PlayerStats_GameReport_DelayMapVote = TRUE;
+               PlayerStats_GameReport_DelayMapVote = true;
 
                serverflags |= SERVERFLAG_PLAYERSTATS;
 
@@ -252,7 +252,7 @@ void PlayerStats_GameReport_Init() // initiated before InitGameplayMode so that
                PlayerStats_GameReport_AddEvent(PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD);
                PlayerStats_GameReport_AddEvent(PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM);
        }
-       else { PlayerStats_GameReport_DelayMapVote = FALSE; }
+       else { PlayerStats_GameReport_DelayMapVote = false; }
 }
 
 void PlayerStats_GameReport_Handler(entity fh, entity pass, float status)
@@ -392,7 +392,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status)
                {
                        // url_fclose has finished
                        dprint("Player stats written\n");
-                       PlayerStats_GameReport_DelayMapVote = FALSE;
+                       PlayerStats_GameReport_DelayMapVote = false;
                        if(PS_GR_OUT_DB >= 0)
                        {
                                db_close(PS_GR_OUT_DB);
@@ -405,7 +405,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status)
                default:
                {
                        print("Player stats writing failed: ", ftos(status), "\n");
-                       PlayerStats_GameReport_DelayMapVote = FALSE;
+                       PlayerStats_GameReport_DelayMapVote = false;
                        if(PS_GR_OUT_DB >= 0)
                        {
                                db_close(PS_GR_OUT_DB);
index ac792a3..53b4476 100644 (file)
@@ -10,7 +10,7 @@ void TEST_Fail(string cond)
 
 void TEST_OK()
 {
-       TEST_ok = TRUE;
+       TEST_ok = true;
 }
 
 float TEST_RunAll()
index 09aec2d..8b35ed9 100644 (file)
@@ -15,6 +15,4 @@
 // Boolean Constants
 const bool true        = 1;
 const bool false       = 0;
-const bool TRUE        = 1;
-const bool FALSE       = 0;
 #endif
index beb27aa..85d75a0 100644 (file)
@@ -253,9 +253,9 @@ float fexists(string f)
     float fh;
     fh = fopen(f, FILE_READ);
     if (fh < 0)
-        return FALSE;
+        return false;
     fclose(fh);
-    return TRUE;
+    return true;
 }
 
 // Databases (hash tables)
@@ -346,14 +346,14 @@ void db_close(float db)
 string db_get(float db, string pKey)
 {
        float h;
-       h = crc16(FALSE, pKey) % DB_BUCKETS;
+       h = crc16(false, pKey) % DB_BUCKETS;
        return uri_unescape(infoget(bufstr_get(db, h), pKey));
 }
 
 void db_put(float db, string pKey, string pValue)
 {
        float h;
-       h = crc16(FALSE, pKey) % DB_BUCKETS;
+       h = crc16(false, pKey) % DB_BUCKETS;
        bufstr_set(db, h, infoadd(bufstr_get(db, h), pKey, uri_escape(pValue)));
 }
 
@@ -628,18 +628,18 @@ void compressShortVector_init()
 #ifndef MENUQC
 float CheckWireframeBox(entity forent, vector v0, vector dvx, vector dvy, vector dvz)
 {
-       traceline(v0, v0 + dvx, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0, v0 + dvy, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0, v0 + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvx, v0 + dvx + dvy, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvx, v0 + dvx + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvy, v0 + dvy + dvx, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvy, v0 + dvy + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvz, v0 + dvz + dvx, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvz, v0 + dvz + dvy, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvx + dvy, v0 + dvx + dvy + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvx + dvz, v0 + dvx + dvy + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
-       traceline(v0 + dvy + dvz, v0 + dvx + dvy + dvz, TRUE, forent); if(trace_fraction < 1) return 0;
+       traceline(v0, v0 + dvx, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0, v0 + dvy, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0, v0 + dvz, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvx, v0 + dvx + dvy, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvx, v0 + dvx + dvz, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvy, v0 + dvy + dvx, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvy, v0 + dvy + dvz, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvz, v0 + dvz + dvx, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvz, v0 + dvz + dvy, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvx + dvy, v0 + dvx + dvy + dvz, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvx + dvz, v0 + dvx + dvy + dvz, true, forent); if(trace_fraction < 1) return 0;
+       traceline(v0 + dvy + dvz, v0 + dvx + dvy + dvz, true, forent); if(trace_fraction < 1) return 0;
        return 1;
 }
 #endif
@@ -937,8 +937,8 @@ float almost_equals(float a, float b)
        float eps;
        eps = (max(a, -a) + max(b, -b)) * 0.001;
        if(a - b < eps && b - a < eps)
-               return TRUE;
-       return FALSE;
+               return true;
+       return false;
 }
 
 float almost_in_bounds(float a, float b, float c)
@@ -2326,12 +2326,12 @@ float InterpretBoolean(string input)
                case "yes":
                case "true":
                case "on":
-                       return TRUE;
+                       return true;
 
                case "no":
                case "false":
                case "off":
-                       return FALSE;
+                       return false;
 
                default: return stof(input);
        }
@@ -2458,25 +2458,25 @@ float cubic_speedfunc(float startspeedfactor, float endspeedfactor, float x)
 float cubic_speedfunc_is_sane(float startspeedfactor, float endspeedfactor)
 {
        if(startspeedfactor < 0 || endspeedfactor < 0)
-               return FALSE;
+               return false;
 
        /*
        // if this is the case, the possible zeros of the first derivative are outside
        // 0..1
        We can calculate this condition as condition
        if(se <= 3)
-               return TRUE;
+               return true;
        */
 
        // better, see below:
        if(startspeedfactor <= 3 && endspeedfactor <= 3)
-               return TRUE;
+               return true;
 
        // if this is the case, the first derivative has no zeros at all
        float se = startspeedfactor + endspeedfactor;
        float s_e = startspeedfactor - endspeedfactor;
        if(3 * (se - 4) * (se - 4) + s_e * s_e <= 12) // an ellipse
-               return TRUE;
+               return true;
 
        // Now let s <= 3, s <= 3, s+e >= 3 (triangle) then we get se <= 6 (top right corner).
        // we also get s_e <= 6 - se
@@ -2484,7 +2484,7 @@ float cubic_speedfunc_is_sane(float startspeedfactor, float endspeedfactor)
        // is quadratic, has value 12 at 3 and 6, and value < 12 in between.
        // Therefore, above "better" check works!
 
-       return FALSE;
+       return false;
 
        // known good cases:
        // (0, [0..3])
index f233cae..25cc17d 100644 (file)
@@ -174,7 +174,7 @@ float W_Arc_Beam_Send(entity to, float sf)
                WriteByte(MSG_ENTITY, self.beam_type);
        }
 
-       return TRUE;
+       return true;
 }
 
 void Reset_ArcBeam(entity player, vector forward)
@@ -224,7 +224,7 @@ void W_Arc_Beam_Think(void)
        if( self.owner.BUTTON_ATCK2 || self.beam_bursting)
        {
                if(!self.beam_bursting)
-                       self.beam_bursting = TRUE;
+                       self.beam_bursting = true;
                burst = ARC_BT_BURSTMASK;
        }
 
@@ -304,7 +304,7 @@ void W_Arc_Beam_Think(void)
 
        W_SetupShot_Range(
                self.owner,
-               TRUE,
+               true,
                0,
                "",
                0,
@@ -332,7 +332,7 @@ void W_Arc_Beam_Think(void)
        if(!self.beam_initialized)
        {
                self.beam_dir = w_shotdir;
-               self.beam_initialized = TRUE;
+               self.beam_initialized = true;
        }
 
        // WEAPONTODO: Detect player velocity so that the beam curves when moving too
@@ -586,10 +586,10 @@ void W_Arc_Beam(float burst)
        beam.think = W_Arc_Beam_Think;
        beam.owner = self;
        beam.movetype = MOVETYPE_NONE;
-       beam.bot_dodge = TRUE;
+       beam.bot_dodge = true;
        beam.bot_dodgerating = WEP_CVAR(arc, beam_damage);
        beam.beam_bursting = burst;
-       Net_LinkEntity(beam, FALSE, 0, W_Arc_Beam_Send);
+       Net_LinkEntity(beam, false, 0, W_Arc_Beam_Send);
 
        entity oldself = self;
        self = beam;
@@ -600,7 +600,7 @@ void W_Arc_Beam(float burst)
 void Arc_Smoke()
 {
        makevectors(self.v_angle);
-       W_SetupShot_Range(self,TRUE,0,"",0,0,0);
+       W_SetupShot_Range(self,true,0,"",0,0,0);
 
        vector smoke_origin = w_shotorg + self.velocity*frametime;
        if ( self.arc_overheat > time )
@@ -645,7 +645,7 @@ float W_Arc(float req)
                                        WEP_CVAR(arc, beam_botaimspeed),
                                        0,
                                        WEP_CVAR(arc, beam_botaimlifetime),
-                                       FALSE
+                                       false
                                );
                        }
                        else
@@ -654,10 +654,10 @@ float W_Arc(float req)
                                        1000000,
                                        0,
                                        0.001,
-                                       FALSE
+                                       false
                                );
                        }
-                       return TRUE;
+                       return true;
                }
                case WR_THINK:
                {
@@ -692,7 +692,7 @@ float W_Arc(float req)
                                        }
                                }
                                
-                               return TRUE;
+                               return true;
                        }
                        
                        if(self.arc_BUTTON_ATCK_prev != 0)
@@ -714,7 +714,7 @@ float W_Arc(float req)
                        }
                        #endif
 
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
@@ -727,13 +727,13 @@ float W_Arc(float req)
                        precache_sound("weapons/arc_loop_overheat.wav");
                        if(!arc_shotorigin[0])
                        {
-                               arc_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 1);
-                               arc_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), FALSE, FALSE, 2);
-                               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_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), false, false, 1);
+                               arc_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ARC), false, false, 2);
+                               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)
-                       return TRUE;
+                       return true;
                }
                case WR_CHECKAMMO1:
                {
@@ -747,7 +747,7 @@ float W_Arc(float req)
                case WR_CONFIG:
                {
                        ARC_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-                       return TRUE;
+                       return true;
                }
                case WR_KILLMESSAGE:
                {
@@ -759,20 +759,20 @@ float W_Arc(float req)
                        weapon_dropevent_item.arc_cooldown = self.arc_cooldown;
                        self.arc_overheat = 0;
                        self.arc_cooldown = 0;
-                       return TRUE;
+                       return true;
                }
                case WR_PICKUP:
                {
-                       if ( !client_hasweapon(self, WEP_ARC, FALSE, FALSE) &&
+                       if ( !client_hasweapon(self, WEP_ARC, false, false) &&
                                weapon_dropevent_item.arc_overheat > time )
                        {
                                self.arc_overheat = weapon_dropevent_item.arc_overheat;
                                self.arc_cooldown = weapon_dropevent_item.arc_cooldown;
                        }
-                       return TRUE;
+                       return true;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #ifdef CSQC
@@ -860,10 +860,10 @@ void Reset_ArcBeam(void)
 {
        entity e;
        for (e = world; (e = findfloat(e, beam_usevieworigin, 1)); ) {
-               e.beam_initialized = FALSE;
+               e.beam_initialized = false;
        }
        for (e = world; (e = findfloat(e, beam_usevieworigin, 2)); ) {
-               e.beam_initialized = FALSE;
+               e.beam_initialized = false;
        }
 }
 
@@ -939,7 +939,7 @@ void Draw_ArcBeam(void)
                if(!self.beam_initialized)
                {
                        self.beam_dir = wantdir;
-                       self.beam_initialized = TRUE;
+                       self.beam_initialized = true;
                }
 
                if(self.beam_dir != wantdir)
@@ -1488,8 +1488,8 @@ void Ent_ReadArcBeam(float isnew)
                                self.beam_color = randomvec();
                                self.beam_alpha = 1;
                                self.beam_thickness = 8;
-                               self.beam_traileffect = FALSE;
-                               self.beam_hiteffect = FALSE;
+                               self.beam_traileffect = false;
+                               self.beam_hiteffect = false;
                                self.beam_hitlight[0] = 0;
                                self.beam_hitlight[1] = 1;
                                self.beam_hitlight[2] = 1;
@@ -1525,20 +1525,20 @@ float W_Arc(float req)
                case WR_IMPACTEFFECT:
                {
                        // todo
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
                        precache_sound("weapons/arc_loop.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_ZOOMRETICLE:
                {
                        // no weapon specific image for this weapon
-                       return FALSE;
+                       return false;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #endif
index aa8d0a8..8b1b6ba 100644 (file)
@@ -77,7 +77,7 @@ void W_Blaster_Think(void)
        self.movetype = MOVETYPE_FLY;
        self.think = SUB_Remove;
        self.nextthink = time + self.blaster_lifetime;
-       CSQCProjectile(self, TRUE, PROJECTILE_BLASTER, TRUE);
+       CSQCProjectile(self, true, PROJECTILE_BLASTER, true);
 }
 
 void W_Blaster_Attack(
@@ -94,13 +94,13 @@ void W_Blaster_Attack(
 {
        vector s_forward = v_forward * cos(atk_shotangle * DEG2RAD) + v_up * sin(atk_shotangle * DEG2RAD);
 
-       W_SetupShot_Dir(self, s_forward, FALSE, 3, "weapons/lasergun_fire.wav", CH_WEAPON_B, atk_damage);
+       W_SetupShot_Dir(self, s_forward, false, 3, "weapons/lasergun_fire.wav", CH_WEAPON_B, atk_damage);
        pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
        entity missile = spawn();
        missile.owner = missile.realowner = self;
        missile.classname = "blasterbolt";
-       missile.bot_dodge = TRUE;
+       missile.bot_dodge = true;
        missile.bot_dodgerating = atk_damage;
        PROJECTILE_MAKETRIGGER(missile);
 
@@ -121,7 +121,7 @@ void W_Blaster_Attack(
                0,
                0,
                atk_spread,
-               FALSE
+               false
        );
 
        missile.angles = vectoangles(missile.velocity);
@@ -156,14 +156,14 @@ float W_Blaster(float request)
                        if(WEP_CVAR(blaster, secondary))
                        {
                                if((random() * (WEP_CVAR_PRI(blaster, damage) + WEP_CVAR_SEC(blaster, damage))) > WEP_CVAR_PRI(blaster, damage))
-                                       { self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(blaster, speed), 0, WEP_CVAR_SEC(blaster, lifetime), FALSE); }
+                                       { self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(blaster, speed), 0, WEP_CVAR_SEC(blaster, lifetime), false); }
                                else
-                                       { self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(blaster, speed), 0, WEP_CVAR_PRI(blaster, lifetime), FALSE); }
+                                       { self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(blaster, speed), 0, WEP_CVAR_PRI(blaster, lifetime), false); }
                        }
                        else
-                               { self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(blaster, speed), 0, WEP_CVAR_PRI(blaster, lifetime), FALSE); }
+                               { self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(blaster, speed), 0, WEP_CVAR_PRI(blaster, lifetime), false); }
 
-                       return TRUE;
+                       return true;
                }
                
                case WR_THINK:
@@ -221,7 +221,7 @@ float W_Blaster(float request)
                                        }
                                }
                        }
-                       return TRUE;
+                       return true;
                }
                
                case WR_INIT: 
@@ -231,25 +231,25 @@ float W_Blaster(float request)
                        precache_model("models/weapons/h_laser.iqm");
                        precache_sound("weapons/lasergun_fire.wav");
                        BLASTER_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-                       return TRUE;
+                       return true;
                }
                
                case WR_SETUP:
                {
                        self.ammo_field = ammo_none;
-                       return TRUE;
+                       return true;
                }
                
                case WR_CHECKAMMO1:
                case WR_CHECKAMMO2:
                {
-                       return TRUE; // laser has infinite ammo
+                       return true; // laser has infinite ammo
                }
                
                case WR_CONFIG:
                {
                        BLASTER_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-                       return TRUE;
+                       return true;
                }
                
                case WR_SUICIDEMESSAGE:
@@ -262,7 +262,7 @@ float W_Blaster(float request)
                        return WEAPON_BLASTER_MURDER;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #ifdef CSQC
@@ -276,21 +276,21 @@ float W_Blaster(float request)
                        org2 = w_org + w_backoff * 6;
                        pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1);
                        if(!w_issilent) { sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); }
-                       return TRUE;
+                       return true;
                }
                
                case WR_INIT:
                {
                        precache_sound("weapons/laserimpact.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_ZOOMRETICLE:
                {
                        // no weapon specific image for this weapon
-                       return FALSE;
+                       return false;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #endif
index 392c452..70efdc0 100644 (file)
@@ -266,7 +266,7 @@ void W_Crylink_LinkJoinEffect_Think(void)
 
 float W_Crylink_Touch_WouldHitFriendly(entity projectile, float rad)
 {
-       entity head = WarpZone_FindRadius((projectile.origin + (projectile.mins + projectile.maxs) * 0.5), rad + MAX_DAMAGEEXTRARADIUS, FALSE);
+       entity head = WarpZone_FindRadius((projectile.origin + (projectile.mins + projectile.maxs) * 0.5), rad + MAX_DAMAGEEXTRARADIUS, false);
        float hit_friendly = 0;
        float hit_enemy = 0;
 
@@ -283,7 +283,7 @@ float W_Crylink_Touch_WouldHitFriendly(entity projectile, float rad)
                head = head.chain;
        }
 
-       return (hit_enemy ? FALSE : hit_friendly);
+       return (hit_enemy ? false : hit_friendly);
 }
 
 // NO bounce protection, as bounces are limited!
@@ -329,7 +329,7 @@ void W_Crylink_Touch(void)
        self.projectiledeathtype |= HITTYPE_BOUNCE;
        // commented out as it causes a little hitch...
        //if(proj.cnt == 0)
-       //      CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
+       //      CSQCProjectile(proj, true, PROJECTILE_CRYLINK, true);
 }
 
 void W_Crylink_Fadethink(void)
@@ -353,7 +353,7 @@ void W_Crylink_Attack(void)
        if(WEP_CVAR_PRI(crylink, joinexplode))
                maxdmg += WEP_CVAR_PRI(crylink, joinexplode_damage);
 
-       W_SetupShot(self, FALSE, 2, "weapons/crylink_fire.wav", CH_WEAPON_A, maxdmg);
+       W_SetupShot(self, false, 2, "weapons/crylink_fire.wav", CH_WEAPON_A, maxdmg);
        forward = v_forward;
        right = v_right;
        up = v_up;
@@ -367,7 +367,7 @@ void W_Crylink_Attack(void)
                proj.reset = W_Crylink_Reset;
                proj.realowner = proj.owner = self;
                proj.classname = "spike";
-               proj.bot_dodge = TRUE;
+               proj.bot_dodge = true;
                proj.bot_dodgerating = WEP_CVAR_PRI(crylink, damage);
                if(shots == 1) {
                        proj.queuenext = proj;
@@ -408,7 +408,7 @@ void W_Crylink_Attack(void)
                        s_z = v_forward.y;
                }
                s = s * WEP_CVAR_PRI(crylink, spread) * g_weaponspreadfactor;
-               W_SetupProjVelocity_Explicit(proj, w_shotdir + right * s.y + up * s.z, v_up, WEP_CVAR_PRI(crylink, speed), 0, 0, 0, FALSE);
+               W_SetupProjVelocity_Explicit(proj, w_shotdir + right * s.y + up * s.z, v_up, WEP_CVAR_PRI(crylink, speed), 0, 0, 0, false);
                proj.touch = W_Crylink_Touch;
 
                proj.think = W_Crylink_Fadethink;
@@ -435,7 +435,7 @@ void W_Crylink_Attack(void)
                proj.flags = FL_PROJECTILE;
                proj.missile_flags = MIF_SPLASH;
     
-               CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE);
+               CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true);
 
                other = proj; MUTATOR_CALLHOOK(EditProjectile);
        }
@@ -462,7 +462,7 @@ void W_Crylink_Attack2(void)
        if(WEP_CVAR_SEC(crylink, joinexplode))
                maxdmg += WEP_CVAR_SEC(crylink, joinexplode_damage);
 
-       W_SetupShot(self, FALSE, 2, "weapons/crylink_fire2.wav", CH_WEAPON_A, maxdmg);
+       W_SetupShot(self, false, 2, "weapons/crylink_fire2.wav", CH_WEAPON_A, maxdmg);
        forward = v_forward;
        right = v_right;
        up = v_up;
@@ -476,7 +476,7 @@ void W_Crylink_Attack2(void)
                proj.reset = W_Crylink_Reset;
                proj.realowner = proj.owner = self;
                proj.classname = "spike";
-               proj.bot_dodge = TRUE;
+               proj.bot_dodge = true;
                proj.bot_dodgerating = WEP_CVAR_SEC(crylink, damage);
                if(shots == 1) {
                        proj.queuenext = proj;
@@ -525,7 +525,7 @@ void W_Crylink_Attack2(void)
                        s = (w_shotdir + (((counter + 0.5) / shots) * 2 - 1) * v_right * WEP_CVAR_SEC(crylink, spread) * g_weaponspreadfactor);
                }
 
-               W_SetupProjVelocity_Explicit(proj, s, v_up, WEP_CVAR_SEC(crylink, speed), 0, 0, 0, FALSE);
+               W_SetupProjVelocity_Explicit(proj, s, v_up, WEP_CVAR_SEC(crylink, speed), 0, 0, 0, false);
                proj.touch = W_Crylink_Touch;
                proj.think = W_Crylink_Fadethink;
                if(counter == (shots - 1) / 2)
@@ -551,7 +551,7 @@ void W_Crylink_Attack2(void)
                proj.flags = FL_PROJECTILE;
         proj.missile_flags = MIF_SPLASH;
         
-               CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE);
+               CSQCProjectile(proj, true, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), true);
 
                other = proj; MUTATOR_CALLHOOK(EditProjectile);
        }
@@ -571,11 +571,11 @@ float W_Crylink(float req)
                case WR_AIM:
                {
                        if(random() < 0.10)
-                               self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(crylink, speed), 0, WEP_CVAR_PRI(crylink, middle_lifetime), FALSE);
+                               self.BUTTON_ATCK = bot_aim(WEP_CVAR_PRI(crylink, speed), 0, WEP_CVAR_PRI(crylink, middle_lifetime), false);
                        else
-                               self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(crylink, speed), 0, WEP_CVAR_SEC(crylink, middle_lifetime), FALSE);
+                               self.BUTTON_ATCK2 = bot_aim(WEP_CVAR_SEC(crylink, speed), 0, WEP_CVAR_SEC(crylink, middle_lifetime), false);
                                
-                       return TRUE;
+                       return true;
                }
                case WR_THINK:
                {
@@ -633,7 +633,7 @@ float W_Crylink(float req)
                                }
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
@@ -644,13 +644,13 @@ float W_Crylink(float req)
                        precache_sound("weapons/crylink_fire2.wav");
                        precache_sound("weapons/crylink_linkjoin.wav");
                        CRYLINK_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-                       return TRUE;
+                       return true;
                }
                case WR_CHECKAMMO1:
                {
                        // don't "run out of ammo" and switch weapons while waiting for release
                        if(self.crylink_lastgroup && self.crylink_waitrelease)
-                               return TRUE;
+                               return true;
 
                        ammo_amount = self.WEP_AMMO(CRYLINK) >= WEP_CVAR_PRI(crylink, ammo);
                        ammo_amount += self.(weapon_load[WEP_CRYLINK]) >= WEP_CVAR_PRI(crylink, ammo);
@@ -660,7 +660,7 @@ float W_Crylink(float req)
                {
                        // don't "run out of ammo" and switch weapons while waiting for release
                        if(self.crylink_lastgroup && self.crylink_waitrelease)
-                               return TRUE;
+                               return true;
 
                        ammo_amount = self.WEP_AMMO(CRYLINK) >= WEP_CVAR_SEC(crylink, ammo);
                        ammo_amount += self.(weapon_load[WEP_CRYLINK]) >= WEP_CVAR_SEC(crylink, ammo);
@@ -669,12 +669,12 @@ float W_Crylink(float req)
                case WR_CONFIG:
                {
                        CRYLINK_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-                       return TRUE;
+                       return true;
                }
                case WR_RELOAD:
                {
                        W_Reload(min(WEP_CVAR_PRI(crylink, ammo), WEP_CVAR_SEC(crylink, ammo)), "weapons/reload.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_SUICIDEMESSAGE:
                {
@@ -685,7 +685,7 @@ float W_Crylink(float req)
                        return WEAPON_CRYLINK_MURDER;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #ifdef CSQC
@@ -710,21 +710,21 @@ float W_Crylink(float req)
                                        sound(self, CH_SHOTS, "weapons/crylink_impact.wav", VOL_BASE, ATTN_NORM);
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
                        precache_sound("weapons/crylink_impact2.wav");
                        precache_sound("weapons/crylink_impact.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_ZOOMRETICLE:
                {
                        // no weapon specific image for this weapon
-                       return FALSE;
+                       return false;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #endif
index 617beed..e49eb60 100644 (file)
@@ -119,12 +119,12 @@ void W_Devastator_DoRemoteExplode(void)
        self.event_damage = func_null;
        self.takedamage = DAMAGE_NO;
 
-       float handled_as_rocketjump = FALSE;
+       float handled_as_rocketjump = false;
 
        entity head = WarpZone_FindRadius(
                self.origin,
                WEP_CVAR(devastator, remote_jump_radius),
-               FALSE
+               false
        );
        
        while(head)
@@ -135,7 +135,7 @@ void W_Devastator_DoRemoteExplode(void)
                        if(distance_to_head <= WEP_CVAR(devastator, remote_jump_radius))
                        {
                                // we handled this as a rocketjump :)
-                               handled_as_rocketjump = TRUE;
+                               handled_as_rocketjump = true;
 
                                // modify velocity 
                                head.velocity_x *= 0.9;
@@ -339,7 +339,7 @@ void W_Devastator_Attack(void)
 
        W_DecreaseAmmo(WEP_CVAR(devastator, ammo));
 
-       W_SetupShot_ProjectileSize(self, '-3 -3 -3', '3 3 3', FALSE, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, WEP_CVAR(devastator, damage));
+       W_SetupShot_ProjectileSize(self, '-3 -3 -3', '3 3 3', false, 5, "weapons/rocket_fire.wav", CH_WEAPON_A, WEP_CVAR(devastator, damage));
        pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
        missile = WarpZone_RefSys_SpawnSameRefSys(self);
@@ -351,14 +351,14 @@ void W_Devastator_Attack(void)
                missile.spawnshieldtime = -1;
        missile.pushltime = time + WEP_CVAR(devastator, guidedelay);
        missile.classname = "rocket";
-       missile.bot_dodge = TRUE;
+       missile.bot_dodge = true;
        missile.bot_dodgerating = WEP_CVAR(devastator, damage) * 2; // * 2 because it can be detonated inflight which makes it even more dangerous
 
        missile.takedamage = DAMAGE_YES;
        missile.damageforcescale = WEP_CVAR(devastator, damageforcescale);
        missile.health = WEP_CVAR(devastator, health);
        missile.event_damage = W_Devastator_Damage;
-       missile.damagedbycontents = TRUE;
+       missile.damagedbycontents = true;
 
        missile.movetype = MOVETYPE_FLY;
        PROJECTILE_MAKETRIGGER(missile);
@@ -376,7 +376,7 @@ void W_Devastator_Attack(void)
        missile.flags = FL_PROJECTILE;
        missile.missile_flags = MIF_SPLASH; 
 
-       CSQCProjectile(missile, WEP_CVAR(devastator, guiderate) == 0 && WEP_CVAR(devastator, speedaccel) == 0, PROJECTILE_ROCKET, FALSE); // because of fly sound
+       CSQCProjectile(missile, WEP_CVAR(devastator, guiderate) == 0 && WEP_CVAR(devastator, speedaccel) == 0, PROJECTILE_ROCKET, false); // because of fly sound
 
        // muzzle flash for 1st person view
        flash = spawn();
@@ -400,12 +400,12 @@ float W_Devastator(float req)
                case WR_AIM:
                {
                        // aim and decide to fire if appropriate
-                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), FALSE);
+                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), false);
                        if(skill >= 2) // skill 0 and 1 bots won't detonate rockets!
                        {
                                // decide whether to detonate rockets
                                entity missile, targetlist, targ;
-                               targetlist = findchainfloat(bot_attack, TRUE);
+                               targetlist = findchainfloat(bot_attack, true);
                                for(missile = world; (missile = find(missile, classname, "rocket")); ) if(missile.realowner == self)
                                {
                                        targ = targetlist;
@@ -413,23 +413,23 @@ float W_Devastator(float req)
                                        {
                                                if(targ != missile.realowner && vlen(targ.origin - missile.origin) < WEP_CVAR(devastator, radius))
                                                {
-                                                       self.BUTTON_ATCK2 = TRUE;
+                                                       self.BUTTON_ATCK2 = true;
                                                        break;
                                                }
                                                targ = targ.chain;
                                        }
                                }
                                
-                               if(self.BUTTON_ATCK2) self.BUTTON_ATCK = FALSE;
+                               if(self.BUTTON_ATCK2) self.BUTTON_ATCK = false;
                        }
                        
-                       return TRUE;
+                       return true;
                }
                #else
                case WR_AIM:
                {
                        // aim and decide to fire if appropriate
-                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), FALSE);
+                       self.BUTTON_ATCK = bot_aim(WEP_CVAR(devastator, speed), 0, WEP_CVAR(devastator, lifetime), false);
                        if(skill >= 2) // skill 0 and 1 bots won't detonate rockets!
                        {
                                // decide whether to detonate rockets
@@ -443,7 +443,7 @@ float W_Devastator(float req)
                                selfdamage = 0;
                                teamdamage = 0;
                                enemydamage = 0;
-                               targetlist = findchainfloat(bot_attack, TRUE);
+                               targetlist = findchainfloat(bot_attack, true);
                                missile = find(world, classname, "rocket");
                                while(missile)
                                {
@@ -493,7 +493,7 @@ float W_Devastator(float req)
                                                        if(
                                                                (v_forward * normalize(missile.origin - targ.origin)< 0.1)
                                                                && desirabledamage > 0.1*coredamage
-                                                       )self.BUTTON_ATCK2 = TRUE;
+                                                       )self.BUTTON_ATCK2 = true;
                                                        targ = targ.chain;
                                                }
                                        }else{
@@ -504,7 +504,7 @@ float W_Devastator(float req)
                                                        if(IS_PLAYER(self.enemy))
                                                                if(desirabledamage >= 0.1*coredamage)
                                                                        if(random()/distance*300 > frametime*bound(0,(10-skill)*0.2,1))
-                                                                               self.BUTTON_ATCK2 = TRUE;
+                                                                               self.BUTTON_ATCK2 = true;
                                        //      dprint(ftos(random()/distance*300),">");dprint(ftos(frametime*bound(0,(10-skill)*0.2,1)),"\n");
                                        }
 
@@ -513,15 +513,15 @@ float W_Devastator(float req)
                                // if we would be doing at X percent of the core damage, detonate it
                                // but don't fire a new shot at the same time!
                                if(desirabledamage >= 0.75 * coredamage) //this should do group damage in rare fortunate events
-                                       self.BUTTON_ATCK2 = TRUE;
+                                       self.BUTTON_ATCK2 = true;
                                if((skill > 6.5) && (selfdamage > self.health))
-                                       self.BUTTON_ATCK2 = FALSE;
-                               //if(self.BUTTON_ATCK2 == TRUE)
+                                       self.BUTTON_ATCK2 = false;
+                               //if(self.BUTTON_ATCK2 == true)
                                //      dprint(ftos(desirabledamage),"\n");
-                               if(self.BUTTON_ATCK2 == TRUE) self.BUTTON_ATCK = FALSE;
+                               if(self.BUTTON_ATCK2 == true) self.BUTTON_ATCK = false;
                        }
                        
-                       return TRUE;
+                       return true;
                }
                #endif
                case WR_THINK:
@@ -551,7 +551,7 @@ float W_Devastator(float req)
                                        {
                                                if(!rock.rl_detonate_later)
                                                {
-                                                       rock.rl_detonate_later = TRUE;
+                                                       rock.rl_detonate_later = true;
                                                        rockfound = 1;
                                                }
                                        }
@@ -560,7 +560,7 @@ float W_Devastator(float req)
                                }
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
@@ -575,12 +575,12 @@ float W_Devastator(float req)
                                precache_sound("weapons/rocket_mode.wav");
                        //}
                        DEVASTATOR_SETTINGS(WEP_SKIP_CVAR, WEP_SET_PROP)
-                       return TRUE;
+                       return true;
                }
                case WR_SETUP:
                {
                        self.rl_release = 1;
-                       return TRUE;
+                       return true;
                }
                case WR_CHECKAMMO1:
                {
@@ -588,14 +588,14 @@ float W_Devastator(float req)
                        // don't switch while guiding a missile
                        if(ATTACK_FINISHED(self) <= time || self.weapon != WEP_DEVASTATOR)
                        {
-                               ammo_amount = FALSE;
+                               ammo_amount = false;
                                if(WEP_CVAR(devastator, reload_ammo))
                                {
                                        if(self.WEP_AMMO(DEVASTATOR) < WEP_CVAR(devastator, ammo) && self.(weapon_load[WEP_DEVASTATOR]) < WEP_CVAR(devastator, ammo))
-                                               ammo_amount = TRUE;
+                                               ammo_amount = true;
                                }
                                else if(self.WEP_AMMO(DEVASTATOR) < WEP_CVAR(devastator, ammo))
-                                       ammo_amount = TRUE;
+                                       ammo_amount = true;
                                return !ammo_amount;
                        }
                        #endif
@@ -603,7 +603,7 @@ float W_Devastator(float req)
                        if(self.rl_release == 0)
                        {
                                printf("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: TRUE\n", self.rl_release, self.WEP_AMMO(DEVASTATOR), WEP_CVAR(devastator, ammo));
-                               return TRUE;
+                               return true;
                        }
                        else
                        {
@@ -620,22 +620,22 @@ float W_Devastator(float req)
                }
                case WR_CHECKAMMO2:
                {
-                       return FALSE;
+                       return false;
                }
                case WR_CONFIG:
                {
                        DEVASTATOR_SETTINGS(WEP_CONFIG_WRITE_CVARS, WEP_CONFIG_WRITE_PROPS)
-                       return TRUE;
+                       return true;
                }
                case WR_RESETPLAYER:
                {
                        self.rl_release = 0;
-                       return TRUE;
+                       return true;
                }
                case WR_RELOAD:
                {
                        W_Reload(WEP_CVAR(devastator, ammo), "weapons/reload.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_SUICIDEMESSAGE:
                {
@@ -649,7 +649,7 @@ float W_Devastator(float req)
                                return WEAPON_DEVASTATOR_MURDER_DIRECT;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #ifdef CSQC
@@ -665,20 +665,20 @@ float W_Devastator(float req)
                        if(!w_issilent)
                                sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
                                
-                       return TRUE;
+                       return true;
                }
                case WR_INIT:
                {
                        precache_sound("weapons/rocket_impact.wav");
-                       return TRUE;
+                       return true;
                }
                case WR_ZOOMRETICLE:
                {
                        // no weapon specific image for this weapon
-                       return FALSE;
+                       return false;
                }
        }
-       return FALSE;
+       return false;
 }
 #endif
 #endif
index 3ec86c7..2c0267d 100644 (file)
@@ -201,7 +201,7 @@ void W_Electro_Bolt_Think(void)
        if(WEP_CVAR_PRI(electro, midaircombo_radius))
        {
                float found = 0;
-               entity e = WarpZone_FindRadius(self.origin, WEP_CVAR_PRI(electro, midaircombo_radius), TRUE);
+               entity e = WarpZone_FindRadius(self.origin, WEP_CVAR_PRI(electro, midaircombo_radius), true);
 
                // loop through nearby orbs and trigger them
                while(e)
@@ -252,7 +252,7 @@ void W_Electro_Attack_Bolt(void)
                self,
                '0 0 -3',
                '0 0 -3',
-               FALSE,
+               false,
                2,
                "weapons/electro_fire.wav",
                CH_WEAPON_A,
@@ -264,7 +264,7 @@ void W_Electro_Attack_Bolt(void)
        proj = spawn();
        proj.classname = "electro_bolt";
        proj.owner = proj.realowner = self;
-       proj.bot_dodge = TRUE;
+       proj.bot_dodge = true;
        proj.bot_dodgerating = WEP_CVAR_PRI(electro, damage);
        proj.use = W_Electro_Explode;
        proj.think = W_Electro_Bolt_Think;
@@ -282,7 +282,7 @@ void W_Electro_Attack_Bolt(void)
        proj.flags = FL_PROJECTILE;
        proj.missile_flags = MIF_SPLASH;
 
-       CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO_BEAM, TRUE);
+       CSQCProjectile(proj, true, PROJECTILE_ELECTRO_BEAM, true);
 
        other = proj; MUTATOR_CALLHOOK(EditProjectile);
 }
@@ -350,7 +350,7 @@ void W_Electro_Attack_Orb(void)
                self,
                '0 0 -4',
                '0 0 -4',
-               FALSE,
+               false,
                2,
                "weapons/electro_fire2.wav",
                CH_WEAPON_A,
@@ -366,7 +366,7 @@ void W_Electro_Attack_Orb(void)
        proj.owner = proj.realowner = self;
        proj.use = W_Electro_Explode;
        proj.think = adaptor_think2use_hittype_splash;
-       proj.bot_dodge = TRUE;
+       proj.bot_dodge = true;
        proj.bot_dodgerating = WEP_CVAR_SEC(electro, damage);
        proj.nextthink = time + WEP_CVAR_SEC(electro, lifetime);
        PROJECTILE_MAKETRIGGER(proj);
@@ -398,7 +398,7 @@ void W_Electro_Attack_Orb(void)
        setsize(p2, proj.mins, proj.maxs);
 #endif
 
-       CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound
+       CSQCProjectile(proj, true, PROJECTILE_ELECTRO, false); // no culling, it has sound
 
        other = proj; MUTATOR_CALLHOOK(EditProjectile);
 }
@@ -426,33 +426,33 @@ float W_Electro(float req)
        {
                case WR_AIM:
                {
-                       self.BUTTON_ATCK = self.BUTTON_ATCK2 = FALSE;
+                       self.BUTTON_ATCK = self.BUTTON_ATCK2 = false;
                        if(vlen(self.origin-self.enemy.origin) > 1000) { self.bot_secondary_electromooth = 0; }
                        if(self.bot_secondary_electromooth == 0)
                        {
                                float shoot;
 
                                if(WEP_CVAR_PRI(electro, speed))
-                                       shoot = bot_aim(WEP_CVAR_PRI(electro, speed), 0, WEP_CVAR_PRI(electro, lifetime), FALSE);
+                                       shoot = bot_aim(WEP_CVAR_PRI(electro, speed), 0, WEP_CVAR_PRI(electro, lifetime), false);
                                else
-                                       shoot = bot_aim(1000000, 0, 0.001, FALSE);
+                                       shoot = bot_aim(1000000, 0, 0.001, false);
 
                                if(shoot)
                                {
-                                       self.BUTTON_ATCK = TRUE;
+                                       self.BUTTON_ATCK = true;
                                        if(random() < 0.01) self.bot_secondary_electromooth = 1;
                                }
                        }
                        else
                        {
-                               if(bot_aim(WEP_CVAR_SEC(electro, speed), WEP_CVAR_SEC(electro, speed_up), WEP_CVAR_SEC(electro, lifetime), TRUE))
+                               if(bot_aim(WEP_CVAR_SEC(electro, speed), WEP_CVAR_SEC(electro, speed_up), WEP_CVAR_SEC(electro, lifetime), true))
                                {
-                                       self.BUTTON_ATCK2 = TRUE;
+                                       self.BUTTON_ATCK2 = true;
                                        if(random() < 0.03) self.bot_secondary_electromooth = 0;
                                }
                        }
                        
-                       return TRUE;
+                       return true;
                }
                case WR_THINK:
                {
@@ -467,10 +467,10 @@ float W_Electro(float req)
                                if(!ammo_amount)
                             &nbs