#include "scores.qh"
#include "command/common.qh"
-#include "defs.qh"
-#include <server/g_world.qh>
-#include <server/miscfunctions.qh>
+#include <common/weapons/_all.qh>
+#include "client.qh"
+#include <server/intermission.qh>
+#include <server/world.qh>
#include <server/mutators/_mod.qh>
+#include <server/round_handler.qh>
#include <common/net_linked.qh>
-#include "../common/playerstats.qh"
-#include "../common/teams.qh"
+#include <common/playerstats.qh>
+#include <common/teams.qh>
#include <common/mapinfo.qh>
#include <common/mutators/base.qh>
#include <common/scores.qh>
entity s;
if(game_stopped)
+ {
score = 0;
+ }
if(!scores_initialized) return 0; // FIXME remove this when everything uses this system
if(t <= 0 || t >= 16)
bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score, player);
score = M_ARGV(1, float);
- if(game_stopped)
- if(!mutator_returnvalue)
+ if(!mutator_returnvalue && game_stopped)
+ {
score = 0;
+ }
if(!scores_initialized) return 0; // FIXME remove this when everything uses this system
entity s = CS(player).scorekeeper;
});
if (result.x == 0 && strict)
- result.x = etof(t1.owner) - etof(t2.owner);
+ result.x = t1.owner.playerid - t2.owner.playerid;
return result.x;
}
sk = CS(p).scorekeeper;
- s = strcat(s, playername(p, false));
+ s = strcat(s, playername(p.netname, p.team, false));
for (;;)
{
i = strlennocol(s) - NAMEWIDTH;
void Score_NicePrint_Spectator(entity to, entity p)
{
- print_to(to, strcat(" ", playername(p, false)));
+ print_to(to, strcat(" ", playername(p.netname, p.team, false)));
}
.float score_dummyfield;