flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

- Fixed a critical bug, which caused players to not getting spawned on the others client

Browse Source 
- corrected newline in cMonsterConfig (VS did :D)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@110 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
lapayo94@gmail.com 2011-12-25 19:34:31 +00:00
parent 62abd8f29b
commit cf720c17e6
2 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/cEntity.cpp
View File

@ -51,6 +51,10 @@ void cEntity::Initialize( cWorld* a_World )
m_World = a_World; m_World = a_World;
m_World->AddEntity( this ); m_World->AddEntity( this );
MoveToCorrectChunk();
/*
Not needed because it´s covered by the MoveToCorrectChunk function
cWorld::BlockToChunk( (int)m_Pos->x, (int)m_Pos->y, (int)m_Pos->z, m_ChunkX, m_ChunkY, m_ChunkZ ); cWorld::BlockToChunk( (int)m_Pos->x, (int)m_Pos->y, (int)m_Pos->z, m_ChunkX, m_ChunkY, m_ChunkZ );
cChunk* Chunk = m_World->GetChunk( m_ChunkX, m_ChunkY, m_ChunkZ ); cChunk* Chunk = m_World->GetChunk( m_ChunkX, m_ChunkY, m_ChunkZ );
if( Chunk ) if( Chunk )
@ -58,6 +62,7 @@ void cEntity::Initialize( cWorld* a_World )
//LOG("Adding entity %i to chunk %i %i %i", m_UniqueID, Chunk->GetPosX(), Chunk->GetPosY(), Chunk->GetPosZ() ); //LOG("Adding entity %i to chunk %i %i %i", m_UniqueID, Chunk->GetPosX(), Chunk->GetPosY(), Chunk->GetPosZ() );
Chunk->AddEntity( *this ); Chunk->AddEntity( *this );
} }
*/
} }
void cEntity::WrapRotation() void cEntity::WrapRotation()

168
source/cMonsterConfig.cpp
View File

@ -1,15 +1,15 @@
#include "cMonsterConfig.h" #include "cMonsterConfig.h"
#include "cMonster.h" #include "cMonster.h"
#include "../iniFile/iniFile.h" #include "../iniFile/iniFile.h"
#include <list> #include <list>
#include <vector> #include <vector>
#include <cstdio> #include <cstdio>
//#include "../source/cprintf.h" //#include "../source/cprintf.h"
#include <string> #include <string>
using namespace std; using namespace std;
extern std::vector<std::string> StringSplit(std::string str, std::string delim); extern std::vector<std::string> StringSplit(std::string str, std::string delim);
struct cMonsterConfig::sAttributesStruct struct cMonsterConfig::sAttributesStruct
{ {
string m_name; string m_name;
@ -17,77 +17,77 @@ struct cMonsterConfig::sAttributesStruct
float m_AttackDamage; float m_AttackDamage;
float m_AttackRange; float m_AttackRange;
float m_AttackRate; float m_AttackRate;
}; };
struct cMonsterConfig::sMonsterConfigState struct cMonsterConfig::sMonsterConfigState
{ {
int TypeCount; int TypeCount;
string MonsterTypes; string MonsterTypes;
list< sAttributesStruct > AttributesList; list< sAttributesStruct > AttributesList;
}; };
cMonsterConfig::cMonsterConfig(int TypeC) cMonsterConfig::cMonsterConfig(int TypeC)
: m_pState( new sMonsterConfigState ) : m_pState( new sMonsterConfigState )
{ {
m_pState->TypeCount = TypeC; m_pState->TypeCount = TypeC;
Initialize(); Initialize();
} }
cMonsterConfig::~cMonsterConfig() { cMonsterConfig::~cMonsterConfig() {
delete m_pState; delete m_pState;
} }
void cMonsterConfig::Initialize() { void cMonsterConfig::Initialize() {
sAttributesStruct Attributes; sAttributesStruct Attributes;
cIniFile SettingsIniFile("settings.ini"); cIniFile SettingsIniFile("settings.ini");
cIniFile MonstersIniFile("monsters.ini"); cIniFile MonstersIniFile("monsters.ini");
if(!SettingsIniFile.ReadFile() || !MonstersIniFile.ReadFile()) { if(!SettingsIniFile.ReadFile() || !MonstersIniFile.ReadFile()) {
printf("Error: Must have both settings.ini and monsters.ini to configure attributes\n\tusing default attributes \n"); printf("Error: Must have both settings.ini and monsters.ini to configure attributes\n\tusing default attributes \n");
return; return;
} }
m_pState->MonsterTypes = SettingsIniFile.GetValue("Monsters","Types",""); m_pState->MonsterTypes = SettingsIniFile.GetValue("Monsters","Types","");
if( m_pState->MonsterTypes.empty() ) { if( m_pState->MonsterTypes.empty() ) {
printf("Error: No Monster types listed in config file, using default attributes \n"); printf("Error: No Monster types listed in config file, using default attributes \n");
return; return;
} }
vector<string> SplitList = StringSplit(m_pState->MonsterTypes,","); vector<string> SplitList = StringSplit(m_pState->MonsterTypes,",");
for(unsigned int i = 0; i < SplitList.size(); ++i) { for(unsigned int i = 0; i < SplitList.size(); ++i) {
if(!SplitList[i].empty()) { if(!SplitList[i].empty()) {
printf("Getting Attributes for: %s \n",SplitList[i].c_str()); printf("Getting Attributes for: %s \n",SplitList[i].c_str());
Attributes.m_name = SplitList[i].c_str(); Attributes.m_name = SplitList[i].c_str();
Attributes.m_AttackDamage = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackDamage",0); Attributes.m_AttackDamage = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackDamage",0);
printf("Got AttackDamage: %3.3f \n",Attributes.m_AttackDamage); printf("Got AttackDamage: %3.3f \n",Attributes.m_AttackDamage);
Attributes.m_AttackRange = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackRange",0); Attributes.m_AttackRange = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackRange",0);
printf("Got AttackRange: %3.3f \n",Attributes.m_AttackRange); printf("Got AttackRange: %3.3f \n",Attributes.m_AttackRange);
Attributes.m_SightDistance = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"SightDistance",0); Attributes.m_SightDistance = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"SightDistance",0);
printf("Got SightDistance: %3.3f \n",Attributes.m_SightDistance); printf("Got SightDistance: %3.3f \n",Attributes.m_SightDistance);
Attributes.m_AttackRate = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackRate",0); Attributes.m_AttackRate = (float)MonstersIniFile.GetValueF(SplitList[i].c_str(),"AttackRate",0);
printf("Got AttackRate: %3.3f \n",Attributes.m_AttackRate); printf("Got AttackRate: %3.3f \n",Attributes.m_AttackRate);
m_pState->AttributesList.push_front(Attributes); m_pState->AttributesList.push_front(Attributes);
} }
} }
} }
void cMonsterConfig::AssignAttributes(cMonster *m, const char* n) void cMonsterConfig::AssignAttributes(cMonster *m, const char* n)
{ {
list<sAttributesStruct>::iterator itr; list<sAttributesStruct>::iterator itr;
for(itr = m_pState->AttributesList.begin(); itr != m_pState->AttributesList.end(); ++itr) { for(itr = m_pState->AttributesList.begin(); itr != m_pState->AttributesList.end(); ++itr) {
if(itr->m_name.compare(n) == 0) { if(itr->m_name.compare(n) == 0) {
//printf("found my attribs: %s :\n",itr->m_name.c_str()); //printf("found my attribs: %s :\n",itr->m_name.c_str());
m->SetAttackDamage(itr->m_AttackDamage); m->SetAttackDamage(itr->m_AttackDamage);
m->SetAttackRange(itr->m_AttackRange); m->SetAttackRange(itr->m_AttackRange);
m->SetSightDistance(itr->m_SightDistance); m->SetSightDistance(itr->m_SightDistance);
m->SetAttackRate((int)itr->m_AttackRate); m->SetAttackRate((int)itr->m_AttackRate);
} }
} }
} }
cMonsterConfig *cMonsterConfig::Get() { cMonsterConfig *cMonsterConfig::Get() {
return this; return this;
} }