it is v1.0, not v0.94

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1965 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-14 18:13:09 +00:00
parent 66f93c9d7d
commit ae6f1981da
14 changed files with 268 additions and 178 deletions
+1 -1
View File
@@ -165,7 +165,7 @@ entity *CACBot::SearchForEnts(bool bUseWPs, float flRange, float flMaxHeight)
{
// This entity doesn't have/need ammo
// Score on type instead
switch(e.type)
//switch(e.type)
{ // UNDONE
}
}
+2 -2
View File
@@ -570,7 +570,7 @@ void startmap(const char *name) // called just after a map load
showscores(false);
intermission = false;
minutesremaining = -1;
if(*clientmap) conoutf("game mode is \"%s\"", modestr(gamemode, modeacronyms));
if(*clientmap) conoutf("game mode is \"%s\"", modestr(gamemode, modeacronyms > 0));
if(firstrun && name && name[0])
{
execfile("config/firstrun.cfg");
@@ -673,7 +673,7 @@ char *votestring(int type, char *arg1, char *arg2)
s_sprintf(out)(msg, atoi(arg1) == 0 ? "disable" : "enable");
break;
case SA_MAP:
s_sprintf(out)(msg, arg1, modestr(atoi(arg2), modeacronyms));
s_sprintf(out)(msg, arg1, modestr(atoi(arg2), modeacronyms > 0));
break;
default:
s_sprintf(out)(msg, arg1, arg2);
+1 -1
View File
@@ -47,7 +47,7 @@ extern int hwtexsize;
#include "protos.h" // external function decls
#define AC_VERSION 940
#define AC_VERSION 1000
#define AC_MASTER_URI "masterserver094.cubers.net/cgi-bin/actioncube.pl/" // FIXME, change DNS on ac release
#endif
+1 -1
View File
@@ -137,7 +137,7 @@ void renderscores(void *menu, bool init)
if(getclientmap()[0])
{
bool fldrprefix = !strncmp(getclientmap(), "maps/", strlen("maps/"));
s_sprintf(modeline)("\"%s\" on map %s", modestr(gamemode, modeacronyms), fldrprefix ? getclientmap()+strlen("maps/") : getclientmap());
s_sprintf(modeline)("\"%s\" on map %s", modestr(gamemode, modeacronyms > 0), fldrprefix ? getclientmap()+strlen("maps/") : getclientmap());
}
extern int minutesremaining;
+1 -1
View File
@@ -478,7 +478,7 @@ void refreshservers(void *menu, bool init)
if(si.address.host != ENET_HOST_ANY && si.ping != 9999)
{
if(si.protocol!=PROTOCOL_VERSION) s_sprintf(si.full)("%s:%d [%s protocol]", si.name, si.port, si.protocol<PROTOCOL_VERSION ? "older" : "newer");
else if(si.map[0]) s_sprintf(si.full)("%d\t%d/%d\t%s, %s: %s:%d %s", si.ping, si.numplayers, si.maxclients, si.map, modestr(si.mode, modeacronyms), si.name, si.port, si.sdesc);
else if(si.map[0]) s_sprintf(si.full)("%d\t%d/%d\t%s, %s: %s:%d %s", si.ping, si.numplayers, si.maxclients, si.map, modestr(si.mode, modeacronyms > 0), si.name, si.port, si.sdesc);
else s_sprintf(si.full)("%d\t%d/%d\tempty: %s:%d %s", si.ping, si.numplayers, si.maxclients, si.name, si.port, si.sdesc);
}
else