oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

servers give player their default clothes on first joining

This commit is contained in:
darkrose 2014-10-30 20:53:43 +10:00
parent 91c9dec4c6
commit c48399628e
3 changed files with 87 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/content_clothesitem.h
View File

@ -14,7 +14,8 @@ enum ClothesType {
CT_BOOTS,
CT_JACKET,
CT_BELT,
CT_DECORATIVE
CT_DECORATIVE,
CT_MEDALLION
};
struct ClothesItemFeatures {

81
src/player.cpp
View File

@ -137,6 +137,7 @@ void Player::checkInventory()
s->addAllowed(c.content);
break;
case CT_DECORATIVE:
case CT_MEDALLION:
d->addAllowed(c.content);
break;
case CT_BELT:
@ -378,6 +379,71 @@ void ServerRemotePlayer::setCharDef(std::string d)
std::string shirt = f.next(":");
std::string pants = f.next(":");
std::string shoes = f.next(":");
{
InventoryList *l = inventory.getList("shirt");
if (!l)
return;
InventoryItem *item = NULL;
if (shirt == "white") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT,0);
}else if (shirt == "blue") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_BLUE,0);
}else if (shirt == "orange") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_ORANGE,0);
}else if (shirt == "purple") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_PURPLE,0);
}else if (shirt == "red") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_RED,0);
}else if (shirt == "yellow") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_YELLOW,0);
}else if (shirt == "black") {
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_BLACK,0);
}
if (item == NULL)
item = new ClothesItem(CONTENT_CLOTHESITEM_COTTON_TSHIRT_GREEN,0);
l->addItem(0,item);
}
{
InventoryList *l = inventory.getList("pants");
if (!l)
return;
InventoryItem *item = NULL;
if (shirt == "white") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS,0);
}else if (shirt == "green") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_GREEN,0);
}else if (shirt == "orange") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_ORANGE,0);
}else if (shirt == "purple") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_PURPLE,0);
}else if (shirt == "red") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_RED,0);
}else if (shirt == "yellow") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_YELLOW,0);
}else if (shirt == "black") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_BLACK,0);
}
if (item == NULL)
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_PANTS_BLUE,0);
l->addItem(0,item);
}
{
InventoryList *l = inventory.getList("boots");
if (!l)
return;
InventoryItem *item = NULL;
if (shirt == "fur") {
item = new ClothesItem(CONTENT_CLOTHESITEM_FUR_SHOES,0);
}else if (shirt == "canvas") {
item = new ClothesItem(CONTENT_CLOTHESITEM_CANVAS_SHOES,0);
}
if (item == NULL)
item = new ClothesItem(CONTENT_CLOTHESITEM_LEATHER_SHOES,0);
l->addItem(0,item);
}
m_given_clothes = true;
}
/*
@ -556,11 +622,11 @@ void RemotePlayer::move(f32 dtime, Map &map, f32 pos_max_d)
video::ITexture* RemotePlayer::getTexture()
{
std::string clothes[4];
const char* list[4] = {"hat","shirt","pants","boots"};
std::string clothes[7];
const char* list[7] = {"hat","shirt","jacket","decorative","belt","pants","boots"};
std::vector<std::string> parts;
getSkin(parts);
for (int j=0; j<4; j++) {
for (int j=0; j<7; j++) {
InventoryList *l = inventory.getList(list[j]);
if (l == NULL)
continue;
@ -575,12 +641,13 @@ video::ITexture* RemotePlayer::getTexture()
tex += parts[0]; // skin
tex += "^" + parts[1]; // face
tex += "^" + parts[2]; // eyes
tex += "^" + clothes[2]; // pants
tex += "^" + clothes[5]; // pants
tex += "^" + clothes[1]; // shirt
// deco
// jacket
tex += "^" + clothes[3]; // boots
tex += "^" + clothes[4]; // belt
tex += "^" + clothes[3]; // deco
tex += "^" + parts[3]; // hair
tex += "^" + clothes[2]; // jacket
tex += "^" + clothes[6]; // boots
tex += "^" + clothes[0]; // hat
return g_texturesource->getTextureRaw(tex);

26
src/server.cpp
View File

@ -1949,24 +1949,21 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
}
// Add player to auth manager
if(m_authmanager.exists(playername) == false)
{
infostream<<"Server: adding player "<<playername
<<" to auth manager"<<std::endl;
if (m_authmanager.exists(playername) == false) {
infostream<<"Server: adding player "<<playername<<" to auth manager"<<std::endl;
m_authmanager.add(playername);
m_authmanager.setPassword(playername, checkpwd);
m_authmanager.setPrivs(playername,
stringToPrivs(g_settings->get("default_privs")));
m_authmanager.setPrivs(playername, stringToPrivs(g_settings->get("default_privs")));
m_authmanager.save();
}
// Enforce user limit.
// Don't enforce for users that have some admin right
if(m_clients.size() >= g_settings->getU16("max_users") &&
(m_authmanager.getPrivs(playername)
& (PRIV_SERVER|PRIV_BAN|PRIV_PRIVS)) == 0 &&
playername != g_settings->get("name"))
{
if (
m_clients.size() >= g_settings->getU16("max_users")
&& (m_authmanager.getPrivs(playername) & (PRIV_SERVER|PRIV_BAN|PRIV_PRIVS)) == 0
&& playername != g_settings->get("name")
) {
SendAccessDenied(m_con, peer_id, L"Too many users.");
return;
}
@ -1975,12 +1972,11 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
Player *player = emergePlayer(playername, password, peer_id);
// If failed, cancel
if(player == NULL)
{
infostream<<"Server: peer_id="<<peer_id
<<": failed to emerge player"<<std::endl;
if (player == NULL) {
infostream<<"Server: peer_id="<<peer_id<<": failed to emerge player"<<std::endl;
return;
}
{
Address address = getPeerAddress(peer_id);
std::string ip_string = address.serializeString();