From 04a96481308730709423082815c3c3554dc9bdb4 Mon Sep 17 00:00:00 2001 From: Rafael Barreto Date: Thu, 13 May 2010 03:37:17 +0000 Subject: [PATCH] Height density calculation git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4837 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clients2c.cpp | 14 ++++++++++++++ source/src/server.cpp | 11 +++++++++++ source/src/tools.cpp | 10 +++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index ae4766cf..3583828b 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -468,6 +468,20 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) addmsg(SV_SPAWN, "rii", player1->lifesequence, player1->weaponsel->type); player1->weaponswitch(player1->primweap); player1->weaponchanging -= weapon::weaponchangetime/2; + + int A = 0, V = 0, h; + for ( int i = 0 ; i < ssize ; i++ ) { + for ( int j = 0 ; j < ssize ; j++ ) { + sqr *s = S(i, j); + if( s->type!=SOLID && (h = s->ceil - s->floor) > 6 ) { + A++; + V+=h; + } + } + } + float H = (float)V/A; +// conoutf("Map height density information (ssize = %d): H = %.2f, V = %d and A = %d", ssize, H,V,A); + break; } diff --git a/source/src/server.cpp b/source/src/server.cpp index ceb0b4bd..4893dfcc 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -1620,6 +1620,16 @@ void startdemoplayback(const char *newname) setupdemoplayback(); } +int Mvolume, Marea; +float Mheight; + +float checkmapvolume () +{ + float Mheight = Marea ? (float)Mvolume/Marea : 0; + logline(ACLOG_INFO, "Map height density information for %s: H = %.2f V = %d and A = %d", smapname, Mheight, Mvolume, Marea); + return Mheight; +} + void startgame(const char *newname, int newmode, int newtime, bool notify) { if(!newname || !*newname || newmode == GMODE_DEMO) fatal("startgame() abused"); @@ -1665,6 +1675,7 @@ void startgame(const char *newname, int newmode, int newtime, bool notify) if(e.fitsmode(smode)) sents[i].spawned = sents[i].legalpickup = true; } mapbuffer.setrevision(); + checkmapvolume(); } else if(isdedicated) sendservmsg("\f3server error: map not found - please start another map"); if(notify) diff --git a/source/src/tools.cpp b/source/src/tools.cpp index af014eb9..7c5ca27c 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -25,7 +25,7 @@ const char *numtime() } extern char *maplayout; -extern int maplayout_factor; +extern int maplayout_factor, Mvolume, Marea; mapstats *loadmapstats(const char *filename, bool getlayout) { @@ -81,6 +81,8 @@ mapstats *loadmapstats(const char *filename, bool getlayout) memset(maplayout, 0, layoutsize * sizeof(char)); char *t = NULL; char floor = 0, ceil; + int diff; + Mvolume = Marea = 0; loopk(layoutsize) { char *c = maplayout + k; @@ -105,10 +107,16 @@ mapstats *loadmapstats(const char *filename, bool getlayout) floor = f->getchar(); ceil = f->getchar(); if(floor >= ceil && ceil > -128) floor = ceil - 1; // for pre 12_13 + diff = ceil - floor; + if ( diff > 6 ) { + Marea++; + Mvolume+=diff; + } if(type == FHF) floor = -128; f->getchar(); f->getchar(); if(s.hdr.version>=2) f->getchar(); if(s.hdr.version>=5) f->getchar(); + case SOLID: *c = type == SOLID ? 127 : floor; f->getchar(); f->getchar();