Thread: [PlaneShift-svn] SF.net SVN: planeshift:[2969] trunk/src (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2969
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2969&view=rev
Author:   weltall2
Date:     2009-02-03 12:57:16 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Committed a missing svn db file from last commit and added an editable life events part separated from the char creation data. Improved also some comments.

Modified Paths:
--------------
    trunk/src/client/gui/pawschardescription.cpp
    trunk/src/client/gui/pawschardescription.h
    trunk/src/client/gui/pawsdetailwindow.cpp
    trunk/src/common/net/messages.h
    trunk/src/server/bulkobjects/pscharacter.cpp
    trunk/src/server/bulkobjects/pscharacter.h
    trunk/src/server/bulkobjects/pscharacterloader.cpp
    trunk/src/server/database/mysql/factions.sql
    trunk/src/server/usermanager.cpp

Modified: trunk/src/client/gui/pawschardescription.cpp
===================================================================

--- trunk/src/client/gui/pawschardescription.cpp	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/client/gui/pawschardescription.cpp	2009-02-03 12:57:16 UTC (rev 2969)
@@ -46,7 +46,7 @@
 
 pawsCharDescription::pawsCharDescription()
 {
-    ooc_editing = false;
+    editingtype = DESC_IC;
 }
 
 pawsCharDescription::~pawsCharDescription()
@@ -90,10 +90,13 @@
 
         if (msg.requestor == "pawsCharDescription")
         {
-            if(ooc_editing)
+            if(editingtype == DESC_IC)
+                description->SetText(msg.desc);
+            else if(editingtype == DESC_OOC)
                 description->SetText(msg.desc_ooc);
             else
-                description->SetText(msg.desc);
+                description->SetText(msg.creationinfo);
+                
             psengine->GetMsgHandler()->Unsubscribe( this, MSGTYPE_CHARACTERDETAILS );
         }
         return;
@@ -107,7 +110,7 @@
         case BTN_OK:
         {
             csString newTxt(description->GetText());
-            psCharacterDescriptionUpdateMessage descUpdate(newTxt,ooc_editing);
+            psCharacterDescriptionUpdateMessage descUpdate(newTxt,editingtype);
             psengine->GetMsgHandler()->SendMessage(descUpdate.msg);
             Hide();
 

Modified: trunk/src/client/gui/pawschardescription.h
===================================================================
--- trunk/src/client/gui/pawschardescription.h	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/client/gui/pawschardescription.h	2009-02-03 12:57:16 UTC (rev 2969)
@@ -32,7 +32,7 @@
 
     bool PostSetup();
     /// used to change the description to be edited
-    void SetOOCDescription(bool editOOC) { ooc_editing = editOOC; }
+    void SetDescriptionType(DESCTYPE type) { editingtype = type; }
     void RequestDetails();
 
     void Show();
@@ -42,7 +42,7 @@
 private:
     pawsMultilineEditTextBox    *description;
     pawsMultiLineTextBox        *creationinfo;
-    bool ooc_editing;
+    DESCTYPE editingtype;
 };
 
 CREATE_PAWS_FACTORY( pawsCharDescription );

Modified: trunk/src/client/gui/pawsdetailwindow.cpp
===================================================================
--- trunk/src/client/gui/pawsdetailwindow.cpp	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/client/gui/pawsdetailwindow.cpp	2009-02-03 12:57:16 UTC (rev 2969)
@@ -267,8 +267,14 @@
         {
             pawsCharDescription *editWindow = (pawsCharDescription*) PawsManager::GetSingleton().FindWidget("DescriptionEdit");
             editWindow->PostSetup();
-            //if the OOC description tab is selected this will be true and the occ description will be shown
-            editWindow->SetOOCDescription(lastTab == (pawsButton*)FindWidget( "ShowDescrOOC" ));
+            //show the right description depending on the tab selected
+            if(lastTab == (pawsButton*)FindWidget( "ShowDescr" ))
+                editWindow->SetDescriptionType(DESC_IC);
+            else if(lastTab == (pawsButton*)FindWidget( "ShowDescrOOC" ))
+                editWindow->SetDescriptionType(DESC_OOC);
+            else
+                editWindow->SetDescriptionType(DESC_CC);
+
             editWindow->Show();
             break;
         }
@@ -318,7 +324,8 @@
             else if(widget->GetID() == BTN_DESCRCC)
             {
                 description->SetText(storedcreationinfo);
-                editButton->Hide();  //hide the edit button it's useless here
+                if(details_editable) editButton->Show(); //if it's editable show the button
+                else                 editButton->Hide();
             }
             else
             {

Modified: trunk/src/common/net/messages.h
===================================================================
--- trunk/src/common/net/messages.h	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/common/net/messages.h	2009-02-03 12:57:16 UTC (rev 2969)
@@ -3608,24 +3608,31 @@
     csString requestor;     /// Identifies which part of system initiated this
 };
 
+enum DESCTYPE
+{
+    DESC_IC = 1, ///< Normal character description
+    DESC_OOC,    ///< Out of Character description
+    DESC_CC      ///< Character life additional data provided by players
+};
+
 class psCharacterDescriptionUpdateMessage : public psMessageCracker
 {
 public:
-    psCharacterDescriptionUpdateMessage(csString& newValue, bool oocdesc)
+    psCharacterDescriptionUpdateMessage(csString& newValue, DESCTYPE desctype)
     {
 
-        msg.AttachNew(new MsgEntry( newValue.Length() +1 + sizeof(oocdesc) ));
+        msg.AttachNew(new MsgEntry( newValue.Length() +1 + sizeof(uint8_t) ));
         msg->SetType(MSGTYPE_CHARDESCUPDATE);
 
         msg->clientnum  = 0;
         msg->Add(newValue);
-        msg->Add(oocdesc);
+        msg->Add( (uint8_t)desctype);
     }
 
     psCharacterDescriptionUpdateMessage(MsgEntry *me)
     {
-        newValue    = me->GetStr();
-        oocdesc     = me->GetBool();
+        newValue    =  me->GetStr();
+        desctype    =  (DESCTYPE) me->GetUInt8();
     }
 
     PSF_DECLARE_MSG_FACTORY();
@@ -3639,7 +3646,7 @@
     virtual csString ToString(AccessPointers * access_ptrs);
 
     csString newValue;
-    bool     oocdesc;
+    DESCTYPE desctype;
 };
 
 //------------------------------------------------------------------------------

Modified: trunk/src/server/bulkobjects/pscharacter.cpp
===================================================================
--- trunk/src/server/bulkobjects/pscharacter.cpp	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/server/bulkobjects/pscharacter.cpp	2009-02-03 12:57:16 UTC (rev 2969)
@@ -248,6 +248,8 @@
     SetCreationInfo(row["creation_info"]); //loads the info gathered in the creation in order to allow the player
                                            //to review them
 
+    SetLifeDescription(row["description_life"]); //Loads the life events added by players
+
     attributes.SetStat(PSITEMSTATS_STAT_STRENGTH,(unsigned int)row.GetFloat("base_strength"), false);
     attributes.SetStat(PSITEMSTATS_STAT_AGILITY,(unsigned int)row.GetFloat("base_agility"), false);
     attributes.SetStat(PSITEMSTATS_STAT_ENDURANCE,(unsigned int)row.GetFloat("base_endurance"), false);
@@ -3754,7 +3756,7 @@
 
 const char* psCharacter::GetDescription()
 {
-    return description;
+    return description.GetDataSafe();
 }
 
 void psCharacter::SetDescription(const char* newValue)
@@ -3773,7 +3775,7 @@
 
 const char* psCharacter::GetOOCDescription()
 {
-    return oocdescription;
+    return oocdescription.GetDataSafe();
 }
 
 void psCharacter::SetOOCDescription(const char* newValue)
@@ -3793,7 +3795,7 @@
 //returns the stored char creation info of the player
 const char* psCharacter::GetCreationInfo()
 {
-    return creationinfo;
+    return creationinfo.GetDataSafe();
 }
 
 void psCharacter::SetCreationInfo(const char* newValue)
@@ -3810,6 +3812,26 @@
         psserver->SendSystemError(GetActor()->GetClient()->GetClientNum(), "Warning! creation info trimmed.");
 }
 
+//returns the stored custom life event info of the player
+const char* psCharacter::GetLifeDescription()
+{
+    return lifedescription.GetDataSafe();
+}
+
+void psCharacter::SetLifeDescription(const char* newValue)
+{
+    lifedescription = newValue;
+    bool bChanged = false;
+    while (lifedescription.Find("\n\n\n\n") != (size_t)-1)
+    {
+        bChanged = true;
+        lifedescription.ReplaceAll("\n\n\n\n", "\n\n\n");
+    }
+
+    if (bChanged && GetActor() && GetActor()->GetClient())
+        psserver->SendSystemError(GetActor()->GetClient()->GetClientNum(), "Warning! custom life events trimmed.");
+}
+
 //TODO: Make this not return a temp csString, but fix in place
 csString NormalizeCharacterName(const csString & name)
 {

Modified: trunk/src/server/bulkobjects/pscharacter.h
===================================================================
--- trunk/src/server/bulkobjects/pscharacter.h	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/server/bulkobjects/pscharacter.h	2009-02-03 12:57:16 UTC (rev 2969)
@@ -1133,6 +1133,11 @@
     /// This is used to store the informations from the char creation. Players shouldn't be able to edit this.
     void SetCreationInfo(const char* newValue);
 
+    /// This is used to get the stored informations from the custom life events made by players
+    const char* GetLifeDescription();
+    /// This is used to store the informations sent by players for their custom life events
+    void SetLifeDescription(const char* newValue);
+
     /// This is used by the math scripting engine to get various values.
     double GetProperty(const char *ptr);
     double CalcFunction(const char * functionName, const double * params);
@@ -1165,27 +1170,24 @@
     PSCHARACTER_WORKSTATE work_state;
     psWorkGameEvent * workEvent;
 
-    csString description; ///<Player description
-    csString oocdescription; ///<Player OOC description
-    csString creationinfo; ///<Creation manager informations
+    csString description;     ///<Player description
+    csString oocdescription;  ///<Player OOC description
+    csString creationinfo;    ///<Creation manager informations
+    csString lifedescription; ///<Custom life events informations
 
-    /// Kill Exp
-    int kill_exp;
+    int kill_exp; ///< Kill Exp
 
-    float attackValueModifier; ///< Attack value is multiplied by this
-    float defenseValueModifier; ///< Defense value is multiplied by this
-    float meleeDefensiveDamageModifier; /// Melee damage to this character is multiplied by this
+    float attackValueModifier;          ///< Attack value is multiplied by this
+    float defenseValueModifier;         ///< Defense value is multiplied by this
+    float meleeDefensiveDamageModifier; ///< Melee damage to this character is multiplied by this
 
-    /// The PowerLevel math script
-    MathScript* powerScript, *maxRealmScript;
+    MathScript* powerScript, *maxRealmScript; ///< The PowerLevel math script
 
-    /// The stamina calc script
-    MathScript* staminaCalc;
+    MathScript* staminaCalc; ///< The stamina calc script
 
 
 protected:
-    /// String value copied from the database containing the last login time
-    csString lastlogintime;
+    csString lastlogintime;///< String value copied from the database containing the last login time
 
     //Stats for this character
     unsigned int deaths;

Modified: trunk/src/server/bulkobjects/pscharacterloader.cpp
===================================================================
--- trunk/src/server/bulkobjects/pscharacterloader.cpp	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/server/bulkobjects/pscharacterloader.cpp	2009-02-03 12:57:16 UTC (rev 2969)
@@ -324,7 +324,7 @@
     values.FormatPush("%s",chardata->GetDescription());
     values.FormatPush("%s",chardata->GetOOCDescription());
     values.FormatPush("%s",chardata->GetCreationInfo());
-    values.FormatPush("%s","");//placeholder life description
+    values.FormatPush("%s",chardata->GetLifeDescription());
     values.FormatPush("%d",chardata->Stats().GetStat(PSITEMSTATS_STAT_STRENGTH, false));
     values.FormatPush("%d",chardata->Stats().GetStat(PSITEMSTATS_STAT_AGILITY, false));
     values.FormatPush("%d",chardata->Stats().GetStat(PSITEMSTATS_STAT_ENDURANCE, false));
@@ -809,7 +809,7 @@
     targetUpdate->AddField("description",chardata->GetDescription());
     targetUpdate->AddField("description_ooc",chardata->GetOOCDescription());
     targetUpdate->AddField("creation_info",chardata->GetCreationInfo());
-    targetUpdate->AddField("description_life",""); //placeholder life description
+    targetUpdate->AddField("description_life",chardata->GetLifeDescription());
 
     // Done building the fields struct, now
     // SAVE it to the DB.

Modified: trunk/src/server/database/mysql/factions.sql
===================================================================
--- trunk/src/server/database/mysql/factions.sql	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/server/database/mysql/factions.sql	2009-02-03 12:57:16 UTC (rev 2969)
@@ -11,6 +11,7 @@
   id int(8) unsigned NOT NULL auto_increment,
   faction_name varchar(40) NOT NULL DEFAULT '' ,
   `faction_description` text,
+  faction_character BLOB  NOT NULL DEFAULT '',
   faction_weight float(6,3) NOT NULL DEFAULT '1.000' ,
   PRIMARY KEY (id)
 );
@@ -20,7 +21,7 @@
 # Dumping data for table 'factions'
 #
 
-INSERT INTO factions VALUES("1","orcs","faction orcs will garantie you are hated by every one except orcs","1.000");
-INSERT INTO factions VALUES("2","merchants","faction merchants will offer you a nice deal from time to time","1.000");
-INSERT INTO factions VALUES("3","liberals","faction liberals will make you popular by all those who value freedom and such stuff","2.000");
-INSERT INTO factions VALUES("4","conservatives","faction conservatives are for those who value tradition and steady life style","2.000");
+INSERT INTO factions VALUES("1","orcs","faction orcs will garantie you are hated by every one except orcs","","1.000");
+INSERT INTO factions VALUES("2","merchants","faction merchants will offer you a nice deal from time to time","","1.000");
+INSERT INTO factions VALUES("3","liberals","faction liberals will make you popular by all those who value freedom and such stuff","","2.000");
+INSERT INTO factions VALUES("4","conservatives","faction conservatives are for those who value tradition and steady life style","","2.000");

Modified: trunk/src/server/usermanager.cpp
===================================================================
--- trunk/src/server/usermanager.cpp	2009-02-03 09:21:39 UTC (rev 2968)
+++ trunk/src/server/usermanager.cpp	2009-02-03 12:57:16 UTC (rev 2969)
@@ -673,6 +673,7 @@
 
     csString charName = charData->GetCharFullName();
     csString raceName;
+    csString creationinfo;
     PSCHARACTER_GENDER gender;
     psRaceInfo* charrinfo = CacheManager::GetSingleton().GetRaceInfoByMeshName(meshName);
     if (charrinfo != NULL)
@@ -693,7 +694,14 @@
         full = true;  // GMs can view the stats list
 
     //send creation info only if the player is requesting  his info
-    csString creationinfo = ( isSelf || full )? charData->GetCreationInfo() : "";
+    if( isSelf || full)
+    {
+        if(requestor != "pawsCharDescription") //only send all if the requestor is the normal description window
+            creationinfo.Format("%s\n\n%s\n\n%s", charData->GetCreationInfo(), " ", charData->GetLifeDescription());
+        else
+            creationinfo = charData->GetLifeDescription();
+    }
+
     csString desc_ooc     = charData->GetOOCDescription();
 
     if (full)
@@ -833,10 +841,12 @@
     if (!charData)
         return;
 
-    if(descUpdate.oocdesc)
+    if(descUpdate.desctype == DESC_IC)
+        charData->SetDescription(descUpdate.newValue);
+    else if(descUpdate.desctype == DESC_OOC)
         charData->SetOOCDescription(descUpdate.newValue);
-    else
-        charData->SetDescription(descUpdate.newValue);
+    else if(descUpdate.desctype == DESC_CC)
+        charData->SetLifeDescription(descUpdate.newValue);
 
     Debug3(LOG_USER, client->GetClientNum(), "Character description updated for %s (%s)\n", charData->GetCharFullName(), ShowID(client->GetAccountID()));
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [PlaneShift-svn] SF.net SVN: planeshift:[2969] trunk/src (Page 3)

planeshift-cvs