Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
committerStijn Buys <ingar@osirion.org>2009-08-18 09:24:15 +0000
commitf030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch)
treecd92baf9e4fa8a136523b9eb570e9811846c9250 /src/core/player.cc
parent5636fad174f0bcff857c357c394c4cc8d424b302 (diff)
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/core/player.cc')
-rw-r--r--src/core/player.cc69
1 files changed, 35 insertions, 34 deletions
diff --git a/src/core/player.cc b/src/core/player.cc
index 4276f20..e048b91 100644
--- a/src/core/player.cc
+++ b/src/core/player.cc
@@ -56,7 +56,7 @@ void Player::print() const
if (zone()) {
con_print << " zone ^B" << zone()->name() << std::endl;
}
-
+
}
void Player::send(const std::string text)
@@ -91,7 +91,7 @@ void Player::set_control(EntityControlable *entitycontrolable)
player_dirty = true;
}
-void Player::set_zone(Zone *zone)
+void Player::set_zone(Zone *zone)
{
if (zone != player_zone) {
player_zone = zone;
@@ -131,7 +131,8 @@ void Player::set_ping(const long ping)
player_ping = ping;
}
-void Player::set_level(const int level) {
+void Player::set_level(const int level)
+{
player_level = level;
}
@@ -172,10 +173,10 @@ void Player::update_info()
void Player::serialize_client_update(std::ostream & os)
{
- os << player_color << " "
- << player_color_second << " "
- << "\"" << player_name << "\" "
- << "\"" << player_rconpassword << "\" ";
+ os << player_color << " "
+ << player_color_second << " "
+ << "\"" << player_name << "\" "
+ << "\"" << player_rconpassword << "\" ";
}
@@ -186,16 +187,16 @@ void Player::receive_client_update(std::istream &is)
std::string n;
char c;
- while ( (is.get(c)) && (c != '"'));
- while ( (is.get(c)) && (c != '"'))
+ while ((is.get(c)) && (c != '"'));
+ while ((is.get(c)) && (c != '"'))
n += c;
if (n.size())
player_name.assign(n);
-
+
n.clear();
- while ( (is.get(c)) && (c != '"'));
- while ( (is.get(c)) && (c != '"'))
+ while ((is.get(c)) && (c != '"'));
+ while ((is.get(c)) && (c != '"'))
n += c;
if (n.size())
@@ -209,14 +210,14 @@ void Player::serialize_server_update(std::ostream & os) const
unsigned int control_id = (player_control ? player_control->id() : 0);
unsigned int mission_id = (player_mission_target ? player_mission_target->id() : 0);
- os << player_id << " "
- << zone_id << " "
- << view_id << " "
- << control_id << " "
- << mission_id << " "
- << player_credits << " "
- << player_level << " "
- << player_ping;
+ os << player_id << " "
+ << zone_id << " "
+ << view_id << " "
+ << control_id << " "
+ << mission_id << " "
+ << player_credits << " "
+ << player_level << " "
+ << player_ping;
}
void Player::receive_server_update(std::istream &is)
@@ -240,21 +241,21 @@ void Player::receive_server_update(std::istream &is)
unsigned int control_id = 0;
is >> control_id;
- if (control_id) {
+ if (control_id) {
Entity *e = Entity::find(control_id);
if (e && e->type() == Entity::Controlable) {
player_control = static_cast<EntityControlable *>(e);
} else {
player_control = 0;
con_warn << "control set to unknown entity " << control_id << "\n";
- }
+ }
} else {
player_control = 0;
}
unsigned int mission_id = 0;
is >> mission_id;
- if (mission_id) {
+ if (mission_id) {
player_mission_target = Entity::find(mission_id);
if (!player_mission_target) {
con_warn << "mission target set to unknown entity " << mission_id << "\n";
@@ -266,7 +267,7 @@ void Player::receive_server_update(std::istream &is)
is >> player_credits;
is >> player_level;
is >> player_ping;
-
+
/*
std::string n;
char c;
@@ -283,13 +284,13 @@ void Player::serialize_short_server_update(std::ostream & os) const
{
unsigned int zone_id = (zone() ? zone()->id() : 0);
- os << player_id << " "
- << "\"" << player_name << "\" "
- << zone_id << " "
- << player_color << " "
- << player_color_second << " "
- << player_level << " "
- << player_ping;
+ os << player_id << " "
+ << "\"" << player_name << "\" "
+ << zone_id << " "
+ << player_color << " "
+ << player_color_second << " "
+ << player_level << " "
+ << player_ping;
}
@@ -308,8 +309,8 @@ void Player::receive_short_server_update(std::istream &is)
// read player name
std::string n;
char c;
- while ( (is.get(c)) && (c != '"'));
- while ( (is.get(c)) && (c != '"'))
+ while ((is.get(c)) && (c != '"'));
+ while ((is.get(c)) && (c != '"'))
n += c;
if (n.size())
@@ -361,7 +362,7 @@ void Player::remove_asset(unsigned int id)
return;
for (std::list<EntityControlable*>::iterator asset = assets.begin(); asset != assets.end(); asset++) {
- if ( ((*asset)->id() == id) && ((*asset)->owner() == this) ) {
+ if (((*asset)->id() == id) && ((*asset)->owner() == this)) {
//con_debug << " removing asset " << (*asset)->id() << " from player " << this->id() << std::endl;
if ((*asset) == player_control)