muzzle fix
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1827 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
@@ -661,7 +661,7 @@ votedisplayinfo *newvotedisplayinfo(playerent *owner, int type, char *arg1, char
|
||||
case SA_GIVEADMIN:
|
||||
{
|
||||
int cn = atoi(arg1);
|
||||
playerent *p = cn == getclientnum() ? player1 : getclient(cn);
|
||||
playerent *p = (cn == getclientnum() ? player1 : getclient(cn));
|
||||
if(!p) return NULL;
|
||||
s_sprintf(v->desc)(msg, colorname(p));
|
||||
break;
|
||||
@@ -804,7 +804,7 @@ void changemap(const char *name) // silently request map ch
|
||||
struct mline { string name, cmd; };
|
||||
static vector<mline> mlines;
|
||||
|
||||
void *kickmenu = NULL, *banmenu = NULL, *forceteammenu = NULL, *givemastermenu = NULL;
|
||||
void *kickmenu = NULL, *banmenu = NULL, *forceteammenu = NULL, *giveadminmenu = NULL;
|
||||
|
||||
void refreshsopmenu(void *menu, bool init)
|
||||
{
|
||||
@@ -814,7 +814,7 @@ void refreshsopmenu(void *menu, bool init)
|
||||
{
|
||||
mline &m = mlines.add();
|
||||
s_strcpy(m.name, colorname(players[i]));
|
||||
s_sprintf(m.cmd)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "givemaster")), i);
|
||||
s_sprintf(m.cmd)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "giveadmin")), i);
|
||||
menumanual(menu, item++, m.name, m.cmd);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -514,7 +514,7 @@ int main(int argc, char **argv)
|
||||
initsound();
|
||||
|
||||
initlog("cfg");
|
||||
extern void *scoremenu, *teammenu, *ctfmenu, *servmenu, *kickmenu, *banmenu, *forceteammenu, *givemastermenu, *docmenu;
|
||||
extern void *scoremenu, *teammenu, *ctfmenu, *servmenu, *kickmenu, *banmenu, *forceteammenu, *giveadminmenu, *docmenu;
|
||||
scoremenu = addmenu("score", "frags\tdeath\tpj\tping\tcn\tname", false, renderscores, false, true);
|
||||
teammenu = addmenu("team score", "frags\tdeath\tpj\tping\tcn\tname", false, renderscores, false, true);
|
||||
ctfmenu = addmenu("ctf score", "flags\tfrags\tdeath\tpj\tping\tcn\tname", false, renderscores, false, true);
|
||||
@@ -522,7 +522,7 @@ int main(int argc, char **argv)
|
||||
kickmenu = addmenu("kick player", NULL, true, refreshsopmenu);
|
||||
banmenu = addmenu("ban player", NULL, true, refreshsopmenu);
|
||||
forceteammenu = addmenu("force team", NULL, true, refreshsopmenu);
|
||||
givemastermenu = addmenu("give master", NULL, true, refreshsopmenu);
|
||||
giveadminmenu = addmenu("give admin", NULL, true, refreshsopmenu);
|
||||
docmenu = addmenu("reference", NULL, true, renderdocmenu);
|
||||
|
||||
persistidents = false;
|
||||
|
||||
@@ -494,7 +494,7 @@ void weapon::renderhudmodel(int lastaction, int index)
|
||||
if(!intermission) wm.calcmove(unitv, lastaction);
|
||||
s_sprintfd(path)("weapons/%s", info.modelname);
|
||||
static int lastanim[2], lastswitch[2];
|
||||
bool emit = (wm.anim&ANIM_INDEX)==ANIM_GUN_SHOOT && (lastmillis - lastaction) < info.attackdelay;
|
||||
bool emit = (wm.anim&ANIM_INDEX)==ANIM_GUN_SHOOT && (lastmillis - lastaction) < info.attackdelay/4;
|
||||
if(lastanim[index]!=(wm.anim|(type<<24)))
|
||||
{
|
||||
lastanim[index] = wm.anim|(type<<24);
|
||||
|
||||
Reference in New Issue
Block a user