|
From: Chad M. <cmm...@us...> - 2005-12-11 01:24:52
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7537/src Modified Files: player.cpp spawnshell.cpp Log Message: Properly signal changes so that spawn list redraws after shrouding and filters are recalculated properly when spawns shroud. Index: player.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/player.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- player.cpp 10 Dec 2005 23:27:15 -0000 1.48 +++ player.cpp 11 Dec 2005 01:24:43 -0000 1.49 @@ -242,10 +242,14 @@ setLevel(player.level); m_curHP = player.curHp; - // set the player level setLevel(player.level); + // update the con table + fillConTable(); + + emit levelChanged(level()); + // Stats hanling setUseDefaults(false); setDeity(player.deity); @@ -287,6 +291,12 @@ player.binds[0].x, player.binds[0].y, player.binds[0].z, player.binds[0].heading); + + // Exp handling + m_minExp = calc_exp(m_level-1, m_race, m_class); + m_maxExp = calc_exp(m_level, m_race, m_class); + m_tickExp = (m_maxExp - m_minExp) / 330; + // Merge in our new skills... for (int a = 0; a < MAX_KNOWN_SKILLS; a++) { @@ -336,10 +346,12 @@ // Load the profile loadProfile(player->profile); + // Guild setGuildID(player->guildID); setGuildTag(m_guildMgr->guildIdToName(guildID())); emit guildChanged(); + // Position setPos((int16_t)lrintf(player->x), (int16_t)lrintf(player->y), (int16_t)lrintf(player->z), @@ -364,19 +376,10 @@ emit addLanguage (a, m_playerLanguages[a]); } - // Move - m_validExp = true; - - // update the con table - fillConTable(); - - // Exp handling - m_minExp = calc_exp(m_level-1, m_race, m_class); - m_maxExp = calc_exp(m_level, m_race, m_class); - m_tickExp = (m_maxExp - m_minExp) / 330; - + // Exp m_currentExp = player->exp; m_currentAltExp = player->expAA; + m_validExp = true; emit expChangedInt (m_currentExp, m_minExp, m_maxExp); emit expAltChangedInt(m_currentAltExp, 0, 15000000); Index: spawnshell.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/spawnshell.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- spawnshell.cpp 10 Dec 2005 23:27:15 -0000 1.44 +++ spawnshell.cpp 11 Dec 2005 01:24:43 -0000 1.45 @@ -828,6 +828,12 @@ m_player->zoneBegin((const ServerZoneEntryStruct*) &shroud->spawn); m_player->loadProfile(shroud->profile); + + // We just updated a lot of stuff. + updateFilterFlags(m_player); + updateRuntimeFilterFlags(m_player); + m_player->updateLastChanged(); + emit changeItem(m_player, tSpawnChangedALL); } } |