void ImpulseCommands (void)
{
- local float imp;
+ float imp;
vector org;
float i;
float m;
return;
self.impulse = 0;
- if (timeoutStatus == 2) //don't allow any impulses while the game is paused
+ // forbid impulses when not in round time
+ if(round_handler_IsActive() && !round_handler_IsRoundStarted())
return;
+ if (timeout_status == TIMEOUT_ACTIVE) //don't allow any impulses while the game is paused
+ return;
+
+ if(self.vehicle)
+ if(self.vehicle.deadflag == DEAD_NO)
+ if(self.vehicle.vehicles_impusle)
+ if(self.vehicle.vehicles_impusle(imp))
+ return;
+
if(CheatImpulse(imp))
{
}
W_NextWeapon (0);
break;
case 11:
- W_SwitchWeapon (self.cnt); // previously used
+ W_LastWeapon();
break;
case 12:
W_PreviousWeapon (0);
W_PreviousWeapon (2);
break;
case 17:
- if (!g_minstagib)
- W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
+ W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE);
break;
case 18:
W_NextWeapon (1);
W_PreviousWeapon (1);
break;
case 20:
- W_DoReload ();
+ W_TriggerReload ();
break;
}
}
else
self.impulse = imp; // retry in next frame
}
+ else if(imp == 21)
+ {
+ PlayerUseKey ();
+ }
else if(imp >= 200 && imp <= 229)
{
if(self.deadflag == DEAD_NO)
switch(imp)
{
case 30:
- wp = WaypointSprite_DeployPersonal("waypoint", self.origin);
+ wp = WaypointSprite_DeployPersonal("waypoint", self.origin, RADARICON_WAYPOINT, '0 1 1');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1');
WaypointSprite_Ping(wp);
- }
sprint(self, "personal waypoint spawned at location\n");
break;
case 31:
WarpZone_crosshair_trace(self);
- wp = WaypointSprite_DeployPersonal("waypoint", trace_endpos);
+ wp = WaypointSprite_DeployPersonal("waypoint", trace_endpos, RADARICON_WAYPOINT, '0 1 1');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1');
WaypointSprite_Ping(wp);
- }
sprint(self, "personal waypoint spawned at crosshair\n");
break;
case 32:
if(vlen(self.death_origin))
{
- wp = WaypointSprite_DeployPersonal("waypoint", self.death_origin);
+ wp = WaypointSprite_DeployPersonal("waypoint", self.death_origin, RADARICON_WAYPOINT, '0 1 1');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1');
WaypointSprite_Ping(wp);
- }
sprint(self, "personal waypoint spawned at death location\n");
}
break;
case 33:
- if(self.deadflag == DEAD_NO && teams_matter)
+ if(self.deadflag == DEAD_NO && teamplay)
{
- wp = WaypointSprite_Attach("helpme", TRUE);
- if(wp)
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_HELPME, '1 0.5 0'); // TODO choose better color
- if(!wp)
- wp = self.waypointsprite_attachedforcarrier; // flag sprite?
- if(wp)
- WaypointSprite_Ping(wp);
+ if not(MUTATOR_CALLHOOK(HelpMePing))
+ {
+ wp = WaypointSprite_Attach("helpme", TRUE, RADARICON_HELPME, '1 0.5 0');
+ if(!wp)
+ WaypointSprite_HelpMePing(self.waypointsprite_attachedforcarrier);
+ else
+ WaypointSprite_Ping(wp);
+ }
sprint(self, "HELP ME attached\n");
}
break;
case 34:
- wp = WaypointSprite_DeployFixed("here", FALSE, self.origin);
+ wp = WaypointSprite_DeployFixed("here", FALSE, self.origin, RADARICON_HERE, '0 1 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "HERE spawned at location\n");
break;
case 35:
WarpZone_crosshair_trace(self);
- wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos);
+ wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos, RADARICON_HERE, '0 1 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "HERE spawned at crosshair\n");
break;
case 36:
if(vlen(self.death_origin))
{
- wp = WaypointSprite_DeployFixed("here", FALSE, self.death_origin);
+ wp = WaypointSprite_DeployFixed("here", FALSE, self.death_origin, RADARICON_HERE, '0 1 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "HERE spawned at death location\n");
}
break;
case 37:
- wp = WaypointSprite_DeployFixed("danger", FALSE, self.origin);
+ wp = WaypointSprite_DeployFixed("danger", FALSE, self.origin, RADARICON_DANGER, '1 0.5 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "DANGER spawned at location\n");
break;
case 38:
WarpZone_crosshair_trace(self);
- wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos);
+ wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos, RADARICON_DANGER, '1 0.5 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "DANGER spawned at crosshair\n");
break;
case 39:
if(vlen(self.death_origin))
{
- wp = WaypointSprite_DeployFixed("danger", FALSE, self.death_origin);
+ wp = WaypointSprite_DeployFixed("danger", FALSE, self.death_origin, RADARICON_DANGER, '1 0.5 0');
if(wp)
- {
- WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
WaypointSprite_Ping(wp);
- }
sprint(self, "DANGER spawned at death location\n");
}
break;
case 107:
for(e = findchain(classname, "waypoint"); e; e = e.chain)
{
- e.colormod_x = 1;
- e.effects &~= EF_NODEPTHTEST | EF_RED | EF_BLUE;
+ e.colormod = '0.5 0.5 0.5';
+ e.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
}
e2 = navigation_findnearestwaypoint(self, FALSE);
navigation_markroutes(e2);
if(e.wpcost >= 10000000)
{
print("unreachable: ", etos(e), " ", vtos(e.origin), "\n");
- e.colormod_x = 0.1;
+ e.colormod_z = 8;
e.effects |= EF_NODEPTHTEST | EF_BLUE;
++i;
++m;
if(e.wpcost >= 10000000)
{
print("cannot reach me: ", etos(e), " ", vtos(e.origin), "\n");
- e.colormod_x = 0.1;
+ e.colormod_x = 8;
if not(e.effects & EF_NODEPTHTEST) // not already reported before
++m;
e.effects |= EF_NODEPTHTEST | EF_RED;
if(navigation_findnearestwaypoint(e, FALSE))
{
setorigin(e, org);
- e.effects &~= EF_NODEPTHTEST;
+ e.effects &= ~EF_NODEPTHTEST;
e.model = "";
}
else
setmodel(e, self.model);
e.frame = self.frame;
e.skin = self.skin;
+ e.colormod = '8 0.5 8';
setsize(e, '0 0 0', '0 0 0');
++i;
}
}
if(i)
print(ftos(i), " spawnpoints have no nearest waypoint (marked by player model)\n");
+ i = 0;
+ entity start;
+ start = findchainflags(flags, FL_ITEM);
+ for(e = start; e; e = e.chain)
+ {
+ e.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
+ e.colormod = '0.5 0.5 0.5';
+ }
+ for(e = start; e; e = e.chain)
+ {
+ if(navigation_findnearestwaypoint(e, FALSE))
+ {
+ }
+ else
+ {
+ print("item without waypoint: ", etos(e), " ", vtos(e.origin), "\n");
+ e.effects |= EF_NODEPTHTEST | EF_RED;
+ e.colormod_x = 8;
+ ++i;
+ }
+ }
+ if(i)
+ print(ftos(i), " items have no nearest waypoint and cannot be walked away from (marked with red light)\n");
+ i = 0;
+ for(e = start; e; e = e.chain)
+ {
+ org = e.origin;
+ if(navigation_findnearestwaypoint(e, TRUE))
+ {
+ }
+ else
+ {
+ print("item without waypoint: ", etos(e), " ", vtos(e.origin), "\n");
+ e.effects |= EF_NODEPTHTEST | EF_BLUE;
+ e.colormod_z = 8;
+ ++i;
+ }
+ }
+ if(i)
+ print(ftos(i), " items have no nearest waypoint and cannot be walked to (marked with blue light)\n");
break;
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff