[Planeshift-cvs] SF.net SVN: planeshift: [171] stable

[<mg...@us...>]

Revision: 171
          http://planeshift.svn.sourceforge.net/planeshift/?rev=171&view=rev
Author:   mgist
Date:     2007-11-03 11:33:55 -0700 (Sat, 03 Nov 2007)

Log Message:
-----------
- Merged r109, r130 from trunk.

Modified Paths:
--------------
    stable/docs/history.txt
    stable/src/client/charapp.cpp
    stable/src/client/psclientchar.cpp
    stable/src/common/paws/pawsimagedrawable.cpp

Modified: stable/docs/history.txt
===================================================================
--- stable/docs/history.txt	2007-11-03 18:00:36 UTC (rev 170)
+++ stable/docs/history.txt	2007-11-03 18:33:55 UTC (rev 171)
@@ -24,11 +24,18 @@
 - Saving of character skills now doesn't clear them all and rewrite them 
   anymore.  Now it does and update and if that fails will do an insert. 
 - Added check to CacheManager::GetBasicItemStatsByID() to bail out if 
-  the ID was 0.     
+  the ID was 0.
 
 *** 2007-10-26 by Sasha Levin
+- Fixed slow mouse pointer. Seems like the cause was a wrong check, that made images fail
+  loading all the time, Making it impossible for the OS to accelerate them.
+
+*** 2007-10-26 by Sasha Levin
 - Added db indexes for common selects. Should speed up those operations.
 
+*** 2007-10-24 by Andrew Craig
+- Fixed an issue with hair colours not being set correctly when removing helm.
+
 *** 2007-10-24 by Sasha Levin
 - Fixed crash in MoveFromInventory.
 - GM2+ can now pick up any PC guarded items.

Modified: stable/src/client/charapp.cpp
===================================================================
--- stable/src/client/charapp.cpp	2007-11-03 18:00:36 UTC (rev 170)
+++ stable/src/client/charapp.cpp	2007-11-03 18:33:55 UTC (rev 171)
@@ -216,8 +216,11 @@
     }
     else if ( show == true )
     {            
-        state->AttachCoreMesh(hairMesh);
-        HairColor(hairShader);
+        state->AttachCoreMesh(hairMesh);        
+        
+        if (colorSet)
+            HairColor(hairShader);
+            
         hairAttached = true;
     }
 }
@@ -733,11 +736,12 @@
 
 void psCharAppearance::Clone(psCharAppearance* clone)
 {
-    this->hairMesh = clone->hairMesh;
-    this->beardMesh = clone->beardMesh;
+    this->hairMesh      = clone->hairMesh;
+    this->beardMesh     = clone->beardMesh;
     
-    this->hairShader = clone->hairShader;    
-    this->faceMaterial = clone->faceMaterial;
-    this->skinToneSet = clone->skinToneSet;   
-    this->hairAttached = clone->hairAttached;
+    this->hairShader    = clone->hairShader;    
+    this->faceMaterial  = clone->faceMaterial;
+    this->skinToneSet   = clone->skinToneSet;   
+    this->hairAttached  = clone->hairAttached;
+    this->colorSet      = clone->colorSet;
 }

Modified: stable/src/client/psclientchar.cpp
===================================================================
--- stable/src/client/psclientchar.cpp	2007-11-03 18:00:36 UTC (rev 170)
+++ stable/src/client/psclientchar.cpp	2007-11-03 18:33:55 UTC (rev 171)
@@ -540,19 +540,11 @@
                 p.Clone(object->charApp);
                 p.SetMesh(dollObject);
                 p.Equip(slotname,equip.mesh,equip.part,equip.partMesh,equip.texture);
-                //doll->charApp->Equip(slotname,equip->mesh,equip->part,equip->partMesh,equip->texture);
-                //Equip(dollObject, &equip, slotname, object->traitList);
             }
         }
     }
     else
     {
-        printf("Dequipping item\n");
-        
-        
-        // Update the actor
-        //Equip(object->pcmesh->GetMesh(), &equip, slotname, object->traitList);
-
         // Update any doll views registered for changes
         csArray<iPAWSSubscriber*> dolls = PawsManager::GetSingleton().ListSubscribers("sigActorUpdate");
         for (size_t i=0; i<dolls.GetSize(); i++)
@@ -577,8 +569,6 @@
                 p.SetMesh(dollObject);
                 p.Clone(object->charApp);
                 p.Dequip(slotname,equip.mesh,equip.part,equip.partMesh,equip.texture);
-                //doll->charApp->Equip(slotname,equip->mesh,equip->part,equip->partMesh,equip->texture);
-                //Equip(dollObject, &equip, slotname, object->traitList);
             }
         }    
         

Modified: stable/src/common/paws/pawsimagedrawable.cpp
===================================================================
--- stable/src/common/paws/pawsimagedrawable.cpp	2007-11-03 18:00:36 UTC (rev 170)
+++ stable/src/common/paws/pawsimagedrawable.cpp	2007-11-03 18:33:55 UTC (rev 171)
@@ -261,7 +261,7 @@
 
     image = imageLoader->Load(buf, CS_IMGFMT_ANY | CS_IMGFMT_ALPHA);
 
-    if (image)
+    if (!image)
     {
         Error2( "Could not load image: '%s'", imageFileLocation.GetData());
         return 0;


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