pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-14 03:38:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into StringFormatting.

Browse Source 
Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp
This commit is contained in:
Arthur Ice
2013-05-19 18:56:21 -07:00
parent b19755a313 fca9c1458b
commit f1a487f606
618 changed files with 38225 additions and 38967 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/watermap.cpp
+42 -44
View File
@@ -1,19 +1,19 @@
/* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org)
/* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2008 EQEMu Development Team (http://eqemu.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY except by those people which sell it, which
are required to give you total support for your newly bought product;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY except by those people which sell it, which
are required to give you total support for your newly bought product;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../common/debug.h"
@@ -26,7 +26,7 @@
#include "../common/StringUtil.h"
#ifdef _WINDOWS
#define snprintf _snprintf
#define snprintf _snprintf
#endif
@@ -47,43 +47,41 @@ WaterRegionType WaterMap::BSPReturnRegionType(int32 node_number, float y, float
float distance;
const ZBSP_Node *current_node = &BSP_Root[node_number-1];
// Are we at a leaf
if((current_node->left==0)&&
(current_node->right==0)) {
if ((current_node->left==0) &&
(current_node->right==0)) {
return (WaterRegionType) current_node->special;
}
// No, so determine which side of the split plane we are on
//
distance = (x * current_node->normal[0]) +
(y * current_node->normal[1]) +
(z * current_node->normal[2]) +
current_node->splitdistance;
(y * current_node->normal[1]) +
(z * current_node->normal[2]) +
current_node->splitdistance;
// If we are exactly on the split plane, I don't know what should happen.
//
if(distance == 0.0f) {
return(RegionTypeNormal);
return(RegionTypeNormal);
}
if(distance >0.0f) {
if(current_node->left==0) {
// This shouldn't happen
return(RegionTypeNormal);
}
return BSPReturnRegionType( current_node->left,
y, x, z);
if(current_node->left==0) {
// This shouldn't happen
return(RegionTypeNormal);
}
return BSPReturnRegionType(current_node->left, y, x, z);
}
if(current_node->right==0) {
// This should't happen
return(RegionTypeNormal);
// This should't happen
return(RegionTypeNormal);
}
return BSPReturnRegionType(current_node->right,
y, x, z);
return BSPReturnRegionType(current_node->right, y, x, z);
}
bool WaterMap::InWater(float y, float x, float z) const {
@@ -153,13 +151,13 @@ bool WaterMap::loadWaterMap(FILE *fp) {
char EQWMagic[10];
uint32 BSPTreeSize;
uint32 EQWVersion;
if(fread(EQWMagic, 10, 1, fp)!=1) {
printf("Error reading Water region map.\n");
return(false);
}
if(strncmp(EQWMagic,"EQEMUWATER",10)) {
printf("Bad header in Water region map.\n");
printf("Bad header in Water region map.\n");
return(false);
}
if(fread(&EQWVersion, sizeof(EQWVersion), 1, fp)!=1) {
@@ -170,25 +168,25 @@ bool WaterMap::loadWaterMap(FILE *fp) {
printf("Incompatible Water region map version.\n");
return(false);
}
if(fread(&BSPTreeSize, sizeof(BSPTreeSize), 1, fp)!=1) {
printf("Error reading Water region map.\n");
return(false);
}
BSP_Root = (ZBSP_Node *) new ZBSP_Node[BSPTreeSize];
if(BSP_Root==nullptr) {
printf("Memory allocation failed while reading water map.\n");
return(false);
}
if(fread(BSP_Root, sizeof(ZBSP_Node), BSPTreeSize, fp) != BSPTreeSize) {
printf("Error reading Water region map.\n");
safe_delete_array(BSP_Root);
return(false);
}
printf("Water region map has %d nodes.\n", BSPTreeSize);
return(true);
}