Merge branch 'master' into terencehill/infomessages_panel_update

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / havocbot / roles.qc

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 2a354d9a57ec23c72faaecd246c9861f85a17518..034e29fabf4a254307abefa73d737131fa545093 100644 (file)
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -35,7 +35,7 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
                // Check if the item can be picked up safely
                if(head.classname == "droppedweapon")
                {
-                       traceline(o, o + '0 0 -1500', true, world);
+                       traceline(o, o + '0 0 -1500', true, NULL);
 
                        d = pointcontents(trace_endpos + '0 0 1');
                        if(d & CONTENT_WATER || d & CONTENT_SLIME || d & CONTENT_LAVA)
@@ -178,7 +178,7 @@ void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org
                // not falling
                if((IS_ONGROUND(it)) == 0)
                {
-                       traceline(it.origin, it.origin + '0 0 -1500', true, world);
+                       traceline(it.origin, it.origin + '0 0 -1500', true, NULL);
                        t = pointcontents(trace_endpos + '0 0 1');
                        if(t != CONTENT_SOLID )
                        if(t & CONTENT_WATER || t & CONTENT_SLIME || t & CONTENT_LAVA)