kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@475 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-06 00:05:10 +00:00
parent c49e30bd39
commit 32d145ed05
23 changed files with 698 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+4 -4
View File
@@ -147,7 +147,7 @@ void additem(int i, int &v, int spawnsec, int t)
{
if(v<itemstats[t].max)
{
addmsg(1, 3, SV_ITEMPICKUP, i, spawnsec);
addmsg(SV_ITEMPICKUP, "rii", i, spawnsec);
ents[i].spawned = false;
};
};
@@ -198,18 +198,18 @@ void pickup(int n, dynent *d)
if(f.state == CTFF_STOLEN) break;
else if(team == rb_team_int(player1->team) && f.state == CTFF_DROPPED)
{
addmsg(1, 2, SV_FLAGRETURN, team);
addmsg(SV_FLAGRETURN, "ri", team);
ents[n].spawned = false;
}
else if(team != rb_team_int(player1->team))
{
addmsg(1, 2, SV_FLAGPICKUP, team);
addmsg(SV_FLAGPICKUP, "ri", team);
ents[n].spawned = false;
f.thief = player1; // do this although we don't know if we picked the flag to avoid getting it after a possible respawn
f.state = CTFF_STOLEN;
f.pick_ack = false;
}
else if(team == rb_team_int(player1->team) && f.state == CTFF_INBASE && flaginfos[rb_opposite(team)].state == CTFF_STOLEN && flaginfos[rb_opposite(team)].thief == player1) addmsg(1, 2, SV_FLAGSCORE, rb_opposite(team));
else if(team == rb_team_int(player1->team) && f.state == CTFF_INBASE && flaginfos[rb_opposite(team)].state == CTFF_STOLEN && flaginfos[rb_opposite(team)].thief == player1) addmsg(SV_FLAGSCORE, "ri", rb_opposite(team));
break;
};
};