WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);\r
WriteByte(MSG_BROADCAST, TE_CSQC_OTHERPLREPORT);\r
WriteByte(MSG_BROADCAST, self.cnt);\r
- if(e.eater.classname == "player") // tempt hackers less by only sending the info of eaten players\r
+ if(e.stat_eaten) // tempt hackers less by only sending the info of eaten players\r
{\r
- if(cvar("g_vore_showpreyhealth"))\r
+ if(cvar("g_vore_showhealth"))\r
WriteByte(MSG_BROADCAST, e.health);\r
else\r
WriteByte(MSG_BROADCAST, 0);\r
- WriteByte(MSG_BROADCAST, num_for_edict(e.eater));\r
+ WriteByte(MSG_BROADCAST, num_for_edict(e.predator));\r
}\r
else\r
{\r
addstat(STAT_DAMAGE_FIRED, AS_INT, stat_fired);\r
addstat(STAT_SHOTORG, AS_INT, stat_shotorg);\r
addstat(STAT_LEADLIMIT, AS_FLOAT, stat_leadlimit);\r
- addstat(STAT_BULLETS_LOADED, AS_INT, campingrifle_bulletcounter);\r
- addstat(STAT_STOMACH_LOAD, AS_INT, stat_stomachload);\r
- addstat(STAT_STOMACH_DIGESTING, AS_INT, stat_digesting);\r
- addstat(STAT_STOMACH_EATEN, AS_INT, stat_eaten);\r
-\r
+ addstat(STAT_WEAPON_CLIPLOAD, AS_INT, clip_load);\r
+ addstat(STAT_WEAPON_CLIPSIZE, AS_INT, clip_size);\r
+ addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);\r
+ addstat(STAT_WINNING, AS_FLOAT, winning);\r
+ addstat(STAT_VORE_LOAD, AS_INT, stat_stomachload);\r
+ addstat(STAT_VORE_CANSWALLOW, AS_INT, stat_canswallow);\r
+ addstat(STAT_VORE_DIGESTING, AS_INT, stat_digesting);\r
+ addstat(STAT_VORE_EATEN, AS_INT, stat_eaten);\r
+ addstat(STAT_VORE_CANLEAVE, AS_INT, stat_canleave);\r
+ addstat(STAT_SBRING1_TYPE, AS_INT, stat_sbring1_type);\r
+ addstat(STAT_SBRING1_CLIP, AS_FLOAT, stat_sbring1_clip);\r
+ addstat(STAT_SBRING2_TYPE, AS_INT, stat_sbring2_type);\r
+ addstat(STAT_SBRING2_CLIP, AS_FLOAT, stat_sbring2_clip);\r
next_pingtime = time + 5;\r
InitializeEntity(self, cvar_changes_init, INITPRIO_CVARS);\r
\r
CheatInit();\r
\r
localcmd("\n_sv_hook_gamestart ", GetGametype(), ";");\r
+ if(cvar("g_campaign"))\r
+ localcmd("\n_sv_hook_campaign_gamestart ", GetGametype(), ";");\r
\r
world_initialized = 1;\r
}\r
{\r
if(cvar("g_campaign"))\r
{\r
- CampaignPostIntermission();\r
- alreadychangedlevel = TRUE;\r
- return TRUE;\r
+ if(cvar("g_campaign_changelevel"))\r
+ {\r
+ CampaignPostIntermission();\r
+ alreadychangedlevel = TRUE;\r
+ return TRUE;\r
+ }\r
+ else\r
+ localcmd("togglemenu 1\n");\r
}\r
if(cvar("quit_when_empty"))\r
{\r
return;\r
\r
if(!mapvote_initialized)\r
- if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_GRABBER && !self.BUTTON_USE)\r
+ if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_JETPACK && !self.BUTTON_USE)\r
return;\r
\r
MapVote_Start();\r
\r
void FixIntermissionClient(entity e)\r
{\r
- string s;\r
if(!e.autoscreenshot) // initial call\r
{\r
e.angles = e.v_angle;\r
if(clienttype(e) == CLIENTTYPE_REAL)\r
{\r
stuffcmd(e, "\nscr_printspeed 1000000\n");\r
- s = cvar_string("sv_intermission_cdtrack");\r
- if(s != "")\r
- stuffcmd(e, strcat("\ncd loop ", s, "\n"));\r
msg_entity = e;\r
WriteByte(MSG_ONE, SVC_INTERMISSION);\r
}\r
CampaignPreIntermission();\r
\r
localcmd("\nsv_hook_gameend;");\r
+ if(cvar("g_campaign"))\r
+ localcmd("\nsv_hook_campaign_gameend;");\r
}\r
\r
/*\r
float i;\r
float nmax, smax;\r
\r
+ if(cvar("g_campaign"))\r
+ return;\r
+\r
MapVote_ClearAllVotes();\r
\r
mapvote_count = 0;\r