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

fix mapdim/showmap, removing the SCOPED message and some extras

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5254 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-06-30 19:10:20 +00:00
parent 2df7e45940
commit da3f17217c
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -1
View File
@@ -590,7 +590,7 @@ bool bad_map() // this function makes a pair with good_map from clients2c
bool tryrespawn()
{
if ( m_mp(gamemode) && bad_map() ) {
hudoutf("This map is not supported in multiplayer");
hudoutf("This map is not supported in multiplayer. Read the docs about map quality/dimensions.");
}
else if(spawnpermission > SP_OK_NUM)
{
source/src/clients2c.cpp
+1 -1
View File
@@ -1096,7 +1096,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
int cn = getint(p);
playerent *pl = cn == getclientnum() ? player1 : getclient(cn);
int ip = getint(p);
if((ip>>24&0xFF) > 0) conoutf("WHOIS %2d: %-16s %d.%d.%d.%d", cn, pl ? colorname(pl) : "", ip&0xFF, ip>>8&0xFF, ip>>16&0xFF, ip>>24&0xFF); // full IP
if((ip>>24&0xFF) > 0) conoutf("WHOIS %2d: %-16s\t%d.%d.%d.%d", cn, pl ? colorname(pl) : "", ip&0xFF, ip>>8&0xFF, ip>>16&0xFF, ip>>24&0xFF); // full IP
else conoutf("WHOIS client %d:\n\f5name\t%s\n\f5IP\t%d.%d.%d.x", cn, pl ? colorname(pl) : "", ip&0xFF, ip>>8&0xFF, ip>>16&0xFF); // censored IP
break;
}
source/src/renderhud.cpp
+6 -6
View File
@@ -394,7 +394,7 @@ vec getradarpos()
void drawradar(playerent *p, int w, int h)
{
// vec center = showmap ? vec(ssize/2, ssize/2, 0) : p->o; int res = showmap ? ssize : radarres;
// vec center = showmap ? vec(ssize/2, ssize/2, 0) : p->o; int res = showmap ? ssize : radarres;
// improved center (for maps that don't use all worldspace)
int gdim = max(mapdims[4], mapdims[5]);
vec center = showmap ? vec(mapdims[0] + mapdims[4]/2, mapdims[1] + mapdims[5]/2, 0) : p->o;
@@ -603,11 +603,11 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
if(command) commandh -= rendercommand(20, 1570, VIRTW);
else if(infostr) draw_text(infostr, 20, 1570);
else if(targetplayer) draw_text(colorname(targetplayer), 20, 1570);
if(targetplayer && targetplayer->weaponsel->type == GUN_SNIPER) // flowtron: for debugging ATM
{
sniperrifle *sr = (sniperrifle *)targetplayer->weaponsel;
if(sr->scoped) draw_textf("\f2SCOPED", 20, 1570 - 2*FONTH);
}
// if(targetplayer && targetplayer->weaponsel->type == GUN_SNIPER) // flowtron: for debugging ATM
// {
// sniperrifle *sr = (sniperrifle *)targetplayer->weaponsel;
// if(sr->scoped) draw_textf("\f2SCOPED", 20, 1570 - 2*FONTH);
// }
glLoadIdentity();
glOrtho(0, VIRTW*2, VIRTH*2, 0, -1, 1);
source/src/worldio.cpp
+1 -1
View File
@@ -627,6 +627,7 @@ bool load_world(char *mname) // still supports all map formats that have
if(f) delete f;
c2skeepalive();
int cwx, cwy;
loopi(7) mapdims[i] = 0;
loopk(4) mapdims[k] = k < 2 ? ssize : 0;
loopk(cubicsize) // FIXME // it is really necessary to loop again?
{
@@ -674,7 +675,6 @@ bool load_world(char *mname) // still supports all map formats that have
mapdims[4], mapdims[5],
mapdims[6]
); // TESTING
loopi(7) mapdims[i] = 0;
pushscontext(IEXC_MAPCFG); // untrusted altogether
persistidents = false;
execfile("config/default_map_settings.cfg");