Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 18:55:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed CR feedback

Browse source
This commit is contained in:
ZappoMan 2013-09-17 17:34:47 -07:00
parent 1bfd23e3de
commit 3145a543d9
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/voxel-server-library/src/VoxelServer.cpp
View file

@ -50,7 +50,7 @@ VoxelServer::VoxelServer(Assignment::Command command, Assignment::Location locat
_argv = NULL;
_dontKillOnMissingDomain = false;
_PACKETS_PER_CLIENT_PER_INTERVAL = 10;
_packetsPerClientPerInterval = 10;
_wantVoxelPersist = true;
_wantLocalDomain = false;
_debugVoxelSending = false;
@ -72,7 +72,7 @@ VoxelServer::VoxelServer(const unsigned char* dataBuffer, int numBytes) : Assign
_argv = NULL;
_dontKillOnMissingDomain = false;
_PACKETS_PER_CLIENT_PER_INTERVAL = 10;
_packetsPerClientPerInterval = 10;
_wantVoxelPersist = true;
_wantLocalDomain = false;
_debugVoxelSending = false;
@ -250,11 +250,11 @@ void VoxelServer::run() {
const char* PACKETS_PER_SECOND = "--packetsPerSecond";
const char* packetsPerSecond = getCmdOption(_argc, _argv, PACKETS_PER_SECOND);
if (packetsPerSecond) {
_PACKETS_PER_CLIENT_PER_INTERVAL = atoi(packetsPerSecond)/INTERVALS_PER_SECOND;
if (_PACKETS_PER_CLIENT_PER_INTERVAL < 1) {
_PACKETS_PER_CLIENT_PER_INTERVAL = 1;
_packetsPerClientPerInterval = atoi(packetsPerSecond) / INTERVALS_PER_SECOND;
if (_packetsPerClientPerInterval < 1) {
_packetsPerClientPerInterval = 1;
}
printf("packetsPerSecond=%s PACKETS_PER_CLIENT_PER_INTERVAL=%d\n", packetsPerSecond, _PACKETS_PER_CLIENT_PER_INTERVAL);
printf("packetsPerSecond=%s PACKETS_PER_CLIENT_PER_INTERVAL=%d\n", packetsPerSecond, _packetsPerClientPerInterval);
}
// for now, initialize the environments with fixed values
@ -342,9 +342,7 @@ void VoxelServer::run() {
}
}
if (_jurisdiction) {
delete _jurisdiction;
}
delete _jurisdiction;
if (_jurisdictionSender) {
_jurisdictionSender->terminate();

4
libraries/voxel-server-library/src/VoxelServer.h
View file

@ -53,7 +53,7 @@ public:
void lockTree() { pthread_mutex_lock(&_treeLock); }
void unlockTree() { pthread_mutex_unlock(&_treeLock); }
int getPacketsPerClientPerInterval() const { return _PACKETS_PER_CLIENT_PER_INTERVAL; }
int getPacketsPerClientPerInterval() const { return _packetsPerClientPerInterval; }
bool getSendMinimalEnvironment() const { return _sendMinimalEnvironment; }
EnvironmentData* getEnvironmentData(int i) { return &_environmentData[i]; }
int getEnvironmentDataCount() const { return sizeof(_environmentData)/sizeof(EnvironmentData); }
@ -64,7 +64,7 @@ private:
bool _dontKillOnMissingDomain;
char _voxelPersistFilename[MAX_FILENAME_LENGTH];
int _PACKETS_PER_CLIENT_PER_INTERVAL;
int _packetsPerClientPerInterval;
VoxelTree _serverTree; // this IS a reaveraging tree
bool _wantVoxelPersist;
bool _wantLocalDomain;