Menu
▾
▴
[Planeshift-cvs] SF.net SVN: planeshift: [389] trunk/src/server
|
From: <ke...@us...> - 2007-12-07 16:32:44
|
Revision: 389
http://planeshift.svn.sourceforge.net/planeshift/?rev=389&view=rev
Author: kemedes
Date: 2007-12-07 08:31:52 -0800 (Fri, 07 Dec 2007)
Log Message:
-----------
- Fixed bad commit.
- Fixed a lot of signness issues.
Modified Paths:
--------------
trunk/src/server/adminmanager.cpp
trunk/src/server/bulkobjects/pscharacter.cpp
trunk/src/server/bulkobjects/pscharacter.h
trunk/src/server/bulkobjects/pstrade.h
trunk/src/server/bulkobjects/pstrainerinfo.cpp
trunk/src/server/bulkobjects/pstrainerinfo.h
trunk/src/server/command.cpp
trunk/src/server/creationmanager.cpp
trunk/src/server/database/mysql/dal.cpp
trunk/src/server/npcmanager.cpp
trunk/src/server/progressionmanager.cpp
trunk/src/server/workmanager.cpp
Modified: trunk/src/server/adminmanager.cpp
===================================================================
--- trunk/src/server/adminmanager.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/adminmanager.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -5270,7 +5270,7 @@
return;
}
- int old_value = pchar->GetSkills()->GetSkillRank(skill->id);
+ unsigned int old_value = pchar->GetSkills()->GetSkillRank(skill->id);
if (data.value == -1)
{
psserver->SendSystemInfo(me->clientnum, "Current '%s' is %d",skill->name.GetDataSafe(),old_value);
Modified: trunk/src/server/bulkobjects/pscharacter.cpp
===================================================================
--- trunk/src/server/bulkobjects/pscharacter.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/bulkobjects/pscharacter.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -1053,7 +1053,7 @@
int psCharacter::GetMaxAllowedRealm( PSSKILL skill )
{
- int waySkillRank = skills.GetSkillRank(skill);
+ unsigned int waySkillRank = skills.GetSkillRank(skill);
if (waySkillRank == 0) // zero skill = no casting
return 0;
@@ -3274,7 +3274,7 @@
return rankup;
}
-void psCharacter::SetSkillRank( PSSKILL which, int rank)
+void psCharacter::SetSkillRank( PSSKILL which, unsigned int rank)
{
if (rank < 0)
rank = 0;
Modified: trunk/src/server/bulkobjects/pscharacter.h
===================================================================
--- trunk/src/server/bulkobjects/pscharacter.h 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/bulkobjects/pscharacter.h 2007-12-07 16:31:52 UTC (rev 389)
@@ -1005,7 +1005,7 @@
/** Directly sets rank of given skill. It completely bypasses the skill logic,
it is used for testing only. */
- void SetSkillRank( PSSKILL which, int rank);
+ void SetSkillRank( PSSKILL which, unsigned int rank);
psSpell * GetSpellByName(const csString& spellName);
psSpell * GetSpellByIdx(int index);
Modified: trunk/src/server/bulkobjects/pstrade.h
===================================================================
--- trunk/src/server/bulkobjects/pstrade.h 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/bulkobjects/pstrade.h 2007-12-07 16:31:52 UTC (rev 389)
@@ -131,13 +131,13 @@
uint32 GetGarbageId() const { return garbageId; }
int GetGarbageQty() const { return garbageQty; }
int GetPrimarySkillId() const { return priSkillId; }
- int GetMinPrimarySkill() const { return minPriSkill; }
- int GetMaxPrimarySkill() const { return maxPriSkill; }
+ unsigned int GetMinPrimarySkill() const { return minPriSkill; }
+ unsigned int GetMaxPrimarySkill() const { return maxPriSkill; }
int GetPrimaryPracticePts() const { return priPracticePts; }
int GetPrimaryQualFactor() const { return priQualFactor; }
int GetSecondarySkillId() const { return secSkillId; }
- int GetMinSecondarySkill() const { return minSecSkill; }
- int GetMaxSecondarySkill() const { return maxSecSkill; }
+ unsigned int GetMinSecondarySkill() const { return minSecSkill; }
+ unsigned int GetMaxSecondarySkill() const { return maxSecSkill; }
int GetSecondaryPracticePts() const { return secPracticePts; }
int GetSecondaryQualFactor() const { return secQualFactor; }
csString& GetRenderEffect() { return renderEffect; }
Modified: trunk/src/server/bulkobjects/pstrainerinfo.cpp
===================================================================
--- trunk/src/server/bulkobjects/pstrainerinfo.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/bulkobjects/pstrainerinfo.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -64,7 +64,7 @@
return isTrainer;
}
-bool psTrainerInfo::TrainingInSkill(PSSKILL skill, int rank, float faction)
+bool psTrainerInfo::TrainingInSkill(PSSKILL skill, unsigned int rank, float faction)
{
csArray<psTrainerSkill*, csPDelArrayElementHandler<psTrainerSkill*> >::Iterator iter = skills.GetIterator();
Modified: trunk/src/server/bulkobjects/pstrainerinfo.h
===================================================================
--- trunk/src/server/bulkobjects/pstrainerinfo.h 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/bulkobjects/pstrainerinfo.h 2007-12-07 16:31:52 UTC (rev 389)
@@ -41,7 +41,7 @@
{
public:
bool Load(unsigned int characterid);
- bool TrainingInSkill(PSSKILL skill, int rank, float faction);
+ bool TrainingInSkill(PSSKILL skill, unsigned int rank, float faction);
private:
csPDelArray<psTrainerSkill> skills;
Modified: trunk/src/server/command.cpp
===================================================================
--- trunk/src/server/command.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/command.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -1943,9 +1943,9 @@
continue;
}
- int z = charData->GetSkills()->GetSkillPractice(info->id);
- int y = charData->GetSkills()->GetSkillKnowledge(info->id);
- int rank = charData->GetSkills()->GetSkillRank(info->id);
+ unsigned int z = charData->GetSkills()->GetSkillPractice(info->id);
+ unsigned int y = charData->GetSkills()->GetSkillKnowledge(info->id);
+ unsigned int rank = charData->GetSkills()->GetSkillRank(info->id);
if ( z == 0 && y == 0 && rank == 0 )
Modified: trunk/src/server/creationmanager.cpp
===================================================================
--- trunk/src/server/creationmanager.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/creationmanager.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -1048,7 +1048,7 @@
int z;
for ( z = 0; z < PSITEMSTATS_STAT_COUNT; z++ )
{
- int value = chardata->GetAttributes()->GetStat( (PSITEMSTATS_STAT)z);
+ unsigned int value = chardata->GetAttributes()->GetStat( (PSITEMSTATS_STAT)z);
if ( value > 0 )
{
mesg.AddStat( value, CacheManager::GetSingleton().Attribute2String((PSITEMSTATS_STAT)z));
@@ -1056,7 +1056,7 @@
}
for ( z = 0; z < PSSKILL_COUNT; z++ )
{
- int rank = chardata->GetSkills()->GetSkillRank( (PSSKILL)z, false );
+ unsigned int rank = chardata->GetSkills()->GetSkillRank( (PSSKILL)z, false );
psSkillInfo* info = CacheManager::GetSingleton().GetSkillByID(z);
csString name("Not found");
Modified: trunk/src/server/database/mysql/dal.cpp
===================================================================
--- trunk/src/server/database/mysql/dal.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/database/mysql/dal.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -219,11 +219,6 @@
lastquery = querystr;
timer.Start();
- if (IsBadStringPtrA(querystr, 200))
- {
- printf("\n\nATTACH!!!!\n\n");
- Sleep(20000);
- }
if (!mysql_query(conn, querystr))
{
if(timer.Stop() > 1000)
@@ -484,7 +479,6 @@
}
}
CPrintf(CON_BUG, "Could not find field %s!. Exiting.\n",fieldname);
- Sleep(20000);
CS_ASSERT(false);
return ""; // Illegal name.
}
Modified: trunk/src/server/npcmanager.cpp
===================================================================
--- trunk/src/server/npcmanager.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/npcmanager.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -2039,20 +2039,20 @@
psPetSkillMessage newmsg(client->GetClientNum(),
psPetSkillMessage::DESCRIPTION,
buff,
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_STRENGTH)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_ENDURANCE)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_AGILITY)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_INTELLIGENCE)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_WILL)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_CHARISMA)),
- int(chr->GetHP()),
- int(chr->GetMana()),
- int(chr->GetStamina(true)),
- int(chr->GetStamina(false)),
- int(chr->GetHitPointsMax()),
- int(chr->GetManaMax()),
- int(chr->GetStaminaMax(true)),
- int(chr->GetStaminaMax(false)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_STRENGTH)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_ENDURANCE)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_AGILITY)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_INTELLIGENCE)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_WILL)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_CHARISMA)),
+ unsigned int(chr->GetHP()),
+ unsigned int(chr->GetMana()),
+ unsigned int(chr->GetStamina(true)),
+ unsigned int(chr->GetStamina(false)),
+ unsigned int(chr->GetHitPointsMax()),
+ unsigned int(chr->GetManaMax()),
+ unsigned int(chr->GetStaminaMax(true)),
+ unsigned int(chr->GetStaminaMax(false)),
true,
PSSKILL_NONE);
Modified: trunk/src/server/progressionmanager.cpp
===================================================================
--- trunk/src/server/progressionmanager.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/progressionmanager.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -4356,20 +4356,20 @@
psGUISkillMessage::DESCRIPTION,
buff,
NULL,
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_STRENGTH)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_ENDURANCE)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_AGILITY)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_INTELLIGENCE)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_WILL)),
- int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_CHARISMA)),
- int(chr->GetHP()),
- int(chr->GetMana()),
- int(chr->GetStamina(true)),
- int(chr->GetStamina(false)),
- int(chr->GetHitPointsMax()),
- int(chr->GetManaMax()),
- int(chr->GetStaminaMax(true)),
- int(chr->GetStaminaMax(false)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_STRENGTH)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_ENDURANCE)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_AGILITY)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_INTELLIGENCE)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_WILL)),
+ unsigned int(chr->GetAttributes()->GetStat(PSITEMSTATS_STAT_CHARISMA)),
+ unsigned int(chr->GetHP()),
+ unsigned int(chr->GetMana()),
+ unsigned int(chr->GetStamina(true)),
+ unsigned int(chr->GetStamina(false)),
+ unsigned int(chr->GetHitPointsMax()),
+ unsigned int(chr->GetManaMax()),
+ unsigned int(chr->GetStaminaMax(true)),
+ unsigned int(chr->GetStaminaMax(false)),
true,
PSSKILL_NONE,
-1,
@@ -4478,7 +4478,7 @@
return;
}
- int current = character->GetSkills()->GetSkillRank((PSSKILL)info->id, false);
+ unsigned int current = character->GetSkills()->GetSkillRank((PSSKILL)info->id, false);
float faction = actorTrainer->GetRelativeFaction(character->GetActor());
if ( !character->GetTrainer()->GetTrainerInfo()->TrainingInSkill((PSSKILL)info->id, current, faction))
{
@@ -4576,7 +4576,7 @@
selectedSkillCat=info->category;
}
- int actualStat;
+ unsigned int actualStat;
if (info->category != 0)
actualStat = character->GetSkills()->GetSkillRank((PSSKILL)skillID);
Modified: trunk/src/server/workmanager.cpp
===================================================================
--- trunk/src/server/workmanager.cpp 2007-12-07 13:34:47 UTC (rev 388)
+++ trunk/src/server/workmanager.cpp 2007-12-07 16:31:52 UTC (rev 389)
@@ -2265,7 +2265,7 @@
if ( priSkill > 0 )
{
// If primary skill is zero, check if this skill should be trained first
- int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
+ unsigned int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
if ( basePriSkill == 0 )
{
if( owner->GetSkills()->GetSkill((PSSKILL)priSkill)->CanTrain() )
@@ -2278,7 +2278,7 @@
if ( secSkill > 0 )
{
// If secondary skill is zero, check if this skill should be trained first
- int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
+ unsigned int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
if ( baseSecSkill == 0 )
{
if( owner->GetSkills()->GetSkill((PSSKILL)secSkill)->CanTrain() )
@@ -2296,8 +2296,8 @@
int priSkill = processCandidate->GetPrimarySkillId();
if ( priSkill > 0 )
{
- int minPriSkill = processCandidate->GetMinPrimarySkill();
- int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
+ unsigned int minPriSkill = processCandidate->GetMinPrimarySkill();
+ unsigned int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
if ( minPriSkill > basePriSkill )
{
return false;
@@ -2308,8 +2308,8 @@
int secSkill = processCandidate->GetSecondarySkillId();
if ( secSkill > 0 )
{
- int minSecSkill = processCandidate->GetMinSecondarySkill();
- int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
+ unsigned int minSecSkill = processCandidate->GetMinSecondarySkill();
+ unsigned int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
if ( minSecSkill > baseSecSkill )
{
return false;
@@ -2334,8 +2334,8 @@
int priSkill = processCandidate->GetPrimarySkillId();
if ( priSkill > 0 )
{
- int maxPriSkill = processCandidate->GetMaxPrimarySkill();
- int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
+ unsigned int maxPriSkill = processCandidate->GetMaxPrimarySkill();
+ unsigned int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
if ( maxPriSkill < basePriSkill )
{
return false;
@@ -2346,8 +2346,8 @@
int secSkill = processCandidate->GetSecondarySkillId();
if ( secSkill > 0 )
{
- int maxSecSkill = processCandidate->GetMaxSecondarySkill();
- int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
+ unsigned int maxSecSkill = processCandidate->GetMaxSecondarySkill();
+ unsigned int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
if ( maxSecSkill < baseSecSkill )
{
return false;
@@ -3123,8 +3123,8 @@
}
// Get the players skill level using the transformations primary skill
- int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
- int maxPriSkill = process->GetMaxPrimarySkill();
+ unsigned int basePriSkill = owner->GetSkills()->GetSkillRank((PSSKILL)priSkill);
+ unsigned int maxPriSkill = process->GetMaxPrimarySkill();
// Get the quality factor for this primary skill
// and only use it if in range.
@@ -3164,8 +3164,8 @@
int secSkill = process->GetSecondarySkillId();
if ( secSkill > 0)
{
- int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
- int maxSecSkill = process->GetMaxSecondarySkill();
+ unsigned int baseSecSkill = owner->GetSkills()->GetSkillRank((PSSKILL)secSkill);
+ unsigned int maxSecSkill = process->GetMaxSecondarySkill();
// Get the quality factor for this secmary skill
// and only use it if in range.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|