#include "sv_cmd.qh"
-#include "all.qh"
+#include "_mod.qh"
#include "banning.qh"
#include "cmd.qh"
#include "../anticheat.qh"
#include "../campaign.qh"
-#include "../cl_client.qh"
-#include "../cl_player.qh"
+#include "../client.qh"
+#include "../player.qh"
#include "../g_world.qh"
#include "../ipban.qh"
#include "../playerdemo.qh"
#include "../teamplay.qh"
-#include "../bot/bot.qh"
-#include "../bot/navigation.qh"
-#include "../bot/scripting.qh"
+#include "../bot/api.qh"
-#include "../mutators/all.qh"
+#include "../mutators/_mod.qh"
#include <common/constants.qh>
+#include <common/net_linked.qh>
#include <common/mapinfo.qh>
#include <common/notifications/all.qh>
#include <common/teams.qh>
#include <common/monsters/sv_monsters.qh>
-void PutObserverInServer();
+void PutObserverInServer(entity this);
// =====================================================
// Server side game commands code, reworked by Samual
// =====================================================
// used by GameCommand_make_mapinfo()
-void make_mapinfo_Think()
+void make_mapinfo_Think(entity this)
{
- SELFPARAM();
- if (MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
+ if (_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
{
LOG_INFO("Done rebuiling mapinfos.\n");
MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
- remove(self);
+ delete(this);
}
else
{
- self.think = make_mapinfo_Think;
- self.nextthink = time;
+ setthink(this, make_mapinfo_Think);
+ this.nextthink = time;
}
}
}
successful = strcat(successful, (successful ? ", " : ""), client.netname);
- LOG_TRACE("Message sent to ", client.netname, "\n");
+ LOG_TRACE("Message sent to ", client.netname);
continue;
}
int n = 0;
FOREACH_CLIENT(IS_PLAYER(it) && IS_REAL_CLIENT(it), LAMBDA(
if (it.caplayer) it.caplayer = 0;
- WITHSELF(it, PutObserverInServer());
+ PutObserverInServer(it);
++n;
));
if (n) bprint(strcat("Successfully forced all (", ftos(n), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n"));
if (accepted > 0)
{
- anticheat_report(client);
+ anticheat_report_to_eventlog(client);
return;
}
else
'0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z,
'1 0 0' * world.absmax.x,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.x));
else LOG_INFO(" ", ftos(trace_endpos.x));
'1 0 0' * world.absmax.x + '0 0 1' * world.absmax.z,
'0 1 0' * world.absmax.y,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.y));
else LOG_INFO(" ", ftos(trace_endpos.y));
'1 0 0' * world.absmax.x + '0 1 0' * world.absmax.y,
'0 0 1' * world.absmax.z,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmin.z));
else LOG_INFO(" ", ftos(trace_endpos.z));
'0 1 0' * world.absmax.y + '0 0 1' * world.absmax.z,
'1 0 0' * world.absmin.x,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.x));
else LOG_INFO(" ", ftos(trace_endpos.x));
'1 0 0' * world.absmax.x + '0 0 1' * world.absmax.z,
'0 1 0' * world.absmin.y,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.y));
else LOG_INFO(" ", ftos(trace_endpos.y));
'1 0 0' * world.absmax.x + '0 1 0' * world.absmax.y,
'0 0 1' * world.absmin.z,
MOVE_WORLDONLY,
- world);
+ NULL);
if (trace_startsolid) LOG_INFO(" ", ftos(world.absmax.z));
else LOG_INFO(" ", ftos(trace_endpos.z));
{
// let's start at token 2 so we can skip sv_cmd bot_cmd
bot = find_bot_by_number(stof(argv(2)));
- if (bot == world) bot = find_bot_by_name(argv(2));
+ if (bot == NULL) bot = find_bot_by_name(argv(2));
if (bot) bot_queuecommand(bot, substring(s, argv_start_index(3), -1));
}
}
else if (argc >= 3) // this comes last
{
bot = find_bot_by_number(stof(argv(1)));
- if (bot == world) bot = find_bot_by_name(argv(1));
+ if (bot == NULL) bot = find_bot_by_name(argv(1));
if (bot)
{
LOG_INFO(strcat("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname, "\n"));
string result2 = (argv(2) ? strcat("^7", argv(2)) : "^4TAILS");
string choice = ((random() > 0.5) ? result1 : result2);
- Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_COINTOSS, choice);
+ Send_Notification(NOTIF_ALL, NULL, MSG_MULTI, MULTI_COINTOSS, choice);
return;
}
if (argv(1) != "")
{
string s = argv(1);
- float t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
+ Gametype t = MapInfo_Type_FromString(s), tsave = MapInfo_CurrentGametype();
if (t)
{
if (argv(1) == "w")
{
.entity weaponentity = weaponentities[0];
- _setmodel(tmp_entity, (nextent(world)).(weaponentity).model);
+ _setmodel(tmp_entity, (nextent(NULL)).(weaponentity).model);
}
else
{
LOG_INFO("bone not found\n");
}
- remove(tmp_entity);
+ delete(tmp_entity);
return;
}
}
if (argv(1) == "w")
{
.entity weaponentity = weaponentities[0];
- _setmodel(tmp_entity, (nextent(world)).(weaponentity).model);
+ _setmodel(tmp_entity, (nextent(NULL)).(weaponentity).model);
}
else
{
LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s\n");
LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s\n");
- remove(tmp_entity);
+ delete(tmp_entity);
return;
}
}
entity tmp_entity;
tmp_entity = new(make_mapinfo);
- tmp_entity.think = make_mapinfo_Think;
+ setthink(tmp_entity, make_mapinfo_Think);
tmp_entity.nextthink = time;
MapInfo_Enumerate();
return;
if (!IS_SPEC(client) && !IS_OBSERVER(client))
{
if (client.caplayer) client.caplayer = 0;
- WITHSELF(client, PutObserverInServer());
+ PutObserverInServer(client);
successful = strcat(successful, (successful ? ", " : ""), client.netname);
}
{
if (teamplay)
{
- float x, t_teams, t_players, team_color;
+ float t_teams, t_players, team_color;
// count the total amount of players and total amount of teams
t_players = 0;
for (int i = 1; i <= t_teams; ++i)
{
// find out how many players to assign to this team
- x = (t_players / t_teams);
- x = ((i == 1) ? ceil(x) : floor(x));
+ int pnum = (t_players / t_teams);
+ pnum = ((i == 1) ? ceil(pnum) : floor(pnum));
team_color = Team_NumberToTeam(i);
// sort through the random list of players made earlier
for (int z = 1; z <= maxclients; ++z)
{
- if (!(shuffleteams_teams[i] >= x))
+ if (!(shuffleteams_teams[i] >= pnum))
{
if (!(shuffleteams_players[z])) continue; // not a player, move on to next random slot
start = stov(vtos(start));
end = stov(vtos(end));
- tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, world);
+ tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, NULL);
if (!trace_startsolid && trace_fraction < 1)
{
p = trace_endpos;
- tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), p, MOVE_NOMONSTERS, world);
+ tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), p, MOVE_NOMONSTERS, NULL);
if (trace_startsolid)
{
rint(42); // do an engine breakpoint on VM_rint so you can get the trace that errnoeously returns startsolid
- tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, world);
+ tracebox(start, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), end, MOVE_NOMONSTERS, NULL);
// how much do we need to back off?
safe = 1;
for ( ; ; )
{
pos = p * (1 - (safe + unsafe) * 0.5) + start * ((safe + unsafe) * 0.5);
- tracebox(pos, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), pos, MOVE_NOMONSTERS, world);
+ tracebox(pos, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), pos, MOVE_NOMONSTERS, NULL);
if (trace_startsolid)
{
if ((safe + unsafe) * 0.5 == unsafe) break;
LOG_INFO("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n");
LOG_INFO("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n");
- tracebox(p, STAT(PL_MIN, NULL) + '0.1 0.1 0.1', STAT(PL_MAX, NULL) - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, world);
+ tracebox(p, STAT(PL_MIN, NULL) + '0.1 0.1 0.1', STAT(PL_MAX, NULL) - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, NULL);
if (trace_startsolid) LOG_INFO("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n");
if (++hitcount >= 10) break;
{
q = p + normalize(end - p) * (dq + dqf);
if (q == q0) break;
- tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), q, MOVE_NOMONSTERS, world);
+ tracebox(p, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), q, MOVE_NOMONSTERS, NULL);
if (trace_startsolid) error("THIS ONE cannot happen");
if (trace_fraction > 0) dq += dqf * trace_fraction;
dqf *= 0.5;
case "debug2":
{
- e = nextent(world);
+ e = nextent(NULL);
tracebox(e.origin + '0 0 32', e.mins, e.maxs, e.origin + '0 0 -1024', MOVE_NORMAL, e);
vv = trace_endpos;
if (trace_fraction == 1)
{
if (argc == 4)
{
- e = nextent(world);
+ e = nextent(NULL);
if (tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), MOVE_NORMAL)) LOG_INFO("can walk\n");
else LOG_INFO("cannot walk\n");
return;
{
vv = stov(argv(2));
dv = stov(argv(3));
- traceline(vv, dv, MOVE_NORMAL, world);
- __trailparticles(world, particleeffectnum(EFFECT_TR_NEXUIZPLASMA), vv, trace_endpos);
- __trailparticles(world, particleeffectnum(EFFECT_TR_CRYLINKPLASMA), trace_endpos, dv);
+ traceline(vv, dv, MOVE_NORMAL, NULL);
+ __trailparticles(NULL, particleeffectnum(EFFECT_TR_NEXUIZPLASMA), vv, trace_endpos);
+ __trailparticles(NULL, particleeffectnum(EFFECT_TR_CRYLINKPLASMA), trace_endpos, dv);
return;
}
}
BanCommand_macro_help();
LOG_INFO("\nCommon networked commands:\n");
- CommonCommand_macro_help(world);
+ CommonCommand_macro_help(NULL);
LOG_INFO("\nGeneric commands shared by all programs:\n");
GenericCommand_macro_help();
{
return;
}
- else if (CommonCommand_macro_usage(argc, world)) // same here, but for common commands instead
+ else if (CommonCommand_macro_usage(argc, NULL)) // same here, but for common commands instead
{
return;
}
{
return; // handled by server/command/ipban.qc
}
- else if (CommonCommand_macro_command(argc, world, command))
+ else if (CommonCommand_macro_command(argc, NULL, command))
{
return; // handled by server/command/common.qc
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff