From: <ko...@us...> - 2009-04-02 11:39:50
|
Revision: 3385 http://planeshift.svn.sourceforge.net/planeshift/?rev=3385&view=rev Author: kougaro Date: 2009-04-02 11:39:40 +0000 (Thu, 02 Apr 2009) Log Message: ----------- Some more memory leaks fixed Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-04-02 10:01:22 UTC (rev 3384) +++ trunk/src/server/cachemanager.cpp 2009-04-02 11:39:40 UTC (rev 3385) @@ -220,7 +220,7 @@ psQuest* newQuest = it.Next (); delete newQuest; } - quests_by_id.DeleteAll(); + quests_by_id.Empty(); } { @@ -292,6 +292,12 @@ while (it.HasNext ()) { csArray<CraftTransInfo*>* newArray = it.Next (); + csArray<CraftTransInfo*>::Iterator it2(newArray->GetIterator ()); + while (it2.HasNext ()) + { + CraftTransInfo* newCraftTransInfo = it2.Next(); + delete newCraftTransInfo; + } delete newArray; } tradeCraftTransInfo_IDHash.Empty(); @@ -336,28 +342,42 @@ { csHash<psItemStats *, csString>::GlobalIterator it (itemStats_NameHash.GetIterator ()); while (it.HasNext ()) - { - psItemStats* itemstats = it.Next (); - delete itemstats; - } - itemStats_NameHash.Empty(); + delete it.Next (); } { csHash<psSectorInfo *>::GlobalIterator it (sectorinfo_by_id.GetIterator ()); while (it.HasNext ()) - { - psSectorInfo* sector = it.Next (); - delete sector; - } - sectorinfo_by_id.Empty(); + delete it.Next (); } { - csHash<ProgressionScript*,csString>::GlobalIterator it(scripts.GetIterator()); - while (it.HasNext()) + csHash<ProgressionScript*,csString>::GlobalIterator it(scripts.GetIterator ()); + while (it.HasNext ()) + delete it.Next (); + } + + { + csHash<CachedObject *, csString>::GlobalIterator it(generic_object_cache.GetIterator ()); + while (it.HasNext ()) delete it.Next(); } + + // only deletes the hash tables in the factions + // the factions themselves will be deleted by the RBTree + { + csHash<Faction*, int>::GlobalIterator it(factions_by_id.GetIterator ()); + while (it.HasNext()) + { + Faction* newFaction = it.Next(); + csHash< FactionLifeEvent *, int >::GlobalIterator it2(newFaction->PositiveFactionEvents.GetIterator ()); + while (it2.HasNext ()) + delete it2.Next(); + csHash< FactionLifeEvent *, int >::GlobalIterator it3(newFaction->NegativeFactionEvents.GetIterator ()); + while (it3.HasNext ()) + delete it3.Next(); + } + } // ToDo: unload everything else } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-04-03 10:10:54
|
Revision: 3390 http://planeshift.svn.sourceforge.net/planeshift/?rev=3390&view=rev Author: kougaro Date: 2009-04-03 10:10:44 +0000 (Fri, 03 Apr 2009) Log Message: ----------- Fixing the unloading of a hash in CacheManager Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-04-03 09:30:48 UTC (rev 3389) +++ trunk/src/server/cachemanager.cpp 2009-04-03 10:10:44 UTC (rev 3390) @@ -360,7 +360,13 @@ { csHash<CachedObject *, csString>::GlobalIterator it(generic_object_cache.GetIterator ()); while (it.HasNext ()) - delete it.Next(); + { + CachedObject * newCachedObject = it.Next (); + newCachedObject->event->CancelEvent(); + newCachedObject->object->ProcessCacheTimeout(); + newCachedObject->object->DeleteSelf(); + delete newCachedObject; + } } // only deletes the hash tables in the factions This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-05-16 20:38:25
|
Revision: 3703 http://planeshift.svn.sourceforge.net/planeshift/?rev=3703&view=rev Author: weltall2 Date: 2009-05-16 20:38:16 +0000 (Sat, 16 May 2009) Log Message: ----------- forgot this files various days ago Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-05-16 20:12:16 UTC (rev 3702) +++ trunk/src/server/cachemanager.cpp 2009-05-16 20:38:16 UTC (rev 3703) @@ -546,6 +546,7 @@ newsector->is_colliding = (result[currentrow].GetInt("collide_objects") != 0); newsector->is_non_transient = (result[currentrow].GetInt("non_transient_objects") != 0); + newsector->say_range = result[currentrow].GetFloat("say_range"); newsector->god_name = result[currentrow]["god_name"]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-07-03 14:31:31
|
Revision: 3901 http://planeshift.svn.sourceforge.net/planeshift/?rev=3901&view=rev Author: kougaro Date: 2009-07-03 14:31:30 +0000 (Fri, 03 Jul 2009) Log Message: ----------- makes skill name comparison case-insensitive again Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-07-03 07:26:32 UTC (rev 3900) +++ trunk/src/server/cachemanager.cpp 2009-07-03 14:31:30 UTC (rev 3901) @@ -454,7 +454,7 @@ newskill->category = PSSKILLS_CATEGORY_VARIOUS; skillinfo_IDHash.Put((int)newskill->id, newskill); - skillinfo_NameHash.Put(newskill->name, newskill); + skillinfo_NameHash.Put(csString(newskill->name).Upcase(), newskill); skillinfo_CategoryHash.Put((int)newskill->category, newskill); maxCommonStrID++; @@ -1614,7 +1614,7 @@ psSkillInfo *CacheManager::GetSkillByName(const char *name) { - return skillinfo_NameHash.Get(csString(name), NULL); + return skillinfo_NameHash.Get(csString(name).Upcase(), NULL); } void CacheManager::GetSkillsListbyCategory(csArray <psSkillInfo*>& listskill, int category ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-07-17 08:40:53
|
Revision: 4042 http://planeshift.svn.sourceforge.net/planeshift/?rev=4042&view=rev Author: weltall2 Date: 2009-07-17 08:40:51 +0000 (Fri, 17 Jul 2009) Log Message: ----------- Fixed PS#2460 - Summary of stats in char create are all in caps patch by caarie Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-07-17 07:44:31 UTC (rev 4041) +++ trunk/src/server/cachemanager.cpp 2009-07-17 08:40:51 UTC (rev 4042) @@ -2174,22 +2174,23 @@ return (unsigned int)tips_list.GetSize(); } +//this is used only by the char creation! const char* CacheManager::Attribute2String( PSITEMSTATS_STAT s ) { switch ( s ) { case PSITEMSTATS_STAT_STRENGTH: - return "STRENGTH"; + return "Strength"; case PSITEMSTATS_STAT_AGILITY: - return "AGILITY"; + return "Agility"; case PSITEMSTATS_STAT_ENDURANCE: - return "ENDURANCE"; + return "Endurance"; case PSITEMSTATS_STAT_INTELLIGENCE: - return "INTELLIGENCE"; + return "Intelligence"; case PSITEMSTATS_STAT_WILL: - return "WILL"; + return "Will"; case PSITEMSTATS_STAT_CHARISMA: - return "CHARISMA"; + return "Charisma"; default: return "None"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mg...@us...> - 2009-09-22 16:03:43
|
Revision: 4483 http://planeshift.svn.sourceforge.net/planeshift/?rev=4483&view=rev Author: mgist Date: 2009-09-22 16:03:37 +0000 (Tue, 22 Sep 2009) Log Message: ----------- - Give empty string an id of 0. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-09-22 16:01:57 UTC (rev 4482) +++ trunk/src/server/cachemanager.cpp 2009-09-22 16:03:37 UTC (rev 4483) @@ -138,9 +138,11 @@ commandManager = NULL; + // Init common string data. compressed_msg_strings = 0; compressed_msg_strings_size = 0; num_compressed_strings = 0; + AddCommmonStringID(""); } CacheManager::~CacheManager() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-12 07:48:19
|
Revision: 4941 http://planeshift.svn.sourceforge.net/planeshift/?rev=4941&view=rev Author: weltall2 Date: 2009-12-12 07:48:11 +0000 (Sat, 12 Dec 2009) Log Message: ----------- fixed PS#3596 - cannot buy books and maps and old error messages text Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-12-12 06:14:36 UTC (rev 4940) +++ trunk/src/server/cachemanager.cpp 2009-12-12 07:48:11 UTC (rev 4941) @@ -1729,7 +1729,15 @@ newtrait->cstr_id_texture = FindCommonStringID(result[currentrow]["cstr_texture"]); newtrait->onlyNPC = result[currentrow].GetInt("only_npc") != 0; newtrait->shaderVar = result[currentrow]["shader"]; - +printf("trait %d %d %d %s %s %s %s %d %s\n", result[currentrow].GetUInt32("id"), +result[currentrow].GetUInt32("next_trait"), +result[currentrow].GetUInt32("race_id"), +result[currentrow]["name"], +result[currentrow]["cstr_mesh"], +result[currentrow]["cstr_material"], +result[currentrow]["cstr_texture"], +result[currentrow].GetInt("only_npc"), +result[currentrow]["shader"]); psRaceInfo * raceInfo = GetRaceInfoByID(newtrait->raceID); if (raceInfo == NULL) { @@ -2650,7 +2658,7 @@ psItemStats* CacheManager::CopyItemStats(uint32 id, csString newName) { // NOTE: This -must- match the schema of item_stats, except for UNIQUE KEY 'name' which is handled below. - const char *fields = "stat_type, weight, visible_distance, size, container_max_size, valid_slots, flags, decay_rate, item_skill_id_1, item_skill_id_2, item_skill_id_3, item_bonus_1_attr, item_bonus_2_attr, item_bonus_3_attr, item_bonus_1_max, item_bonus_2_max, item_bonus_3_max, dmg_slash, dmg_blunt, dmg_pierce, weapon_speed, weapon_penetration, weapon_block_targeted, weapon_block_untargeted, weapon_counterblock, armor_hardness, cstr_id_gfx_mesh, cstr_id_gfx_icon, cstr_id_gfx_texture, cstr_id_part, cstr_id_part_mesh, armorvsweapon_type, category_id, base_sale_price, item_type, requirement_1_name, requirement_1_value, requirement_2_name, requirement_2_value, requirement_3_name, requirement_3_value, item_type_id_ammo, spell_id_on_hit, spell_on_hit_prob, spell_id_feature, spell_feature_charges, spell_feature_timing, item_anim_id, description, sound, item_max_quality, equip_script, consume_script, creative_definition, max_charges, weapon_range"; + const char *fields = "stat_type, weight, visible_distance, size, container_max_size, valid_slots, flags, decay_rate, item_skill_id_1, item_skill_id_2, item_skill_id_3, item_bonus_1_attr, item_bonus_2_attr, item_bonus_3_attr, item_bonus_1_max, item_bonus_2_max, item_bonus_3_max, dmg_slash, dmg_blunt, dmg_pierce, weapon_speed, weapon_penetration, weapon_block_targeted, weapon_block_untargeted, weapon_counterblock, armor_hardness, cstr_gfx_mesh, cstr_id_gfx_icon, cstr_id_gfx_texture, cstr_id_part, cstr_id_part_mesh, armorvsweapon_type, category_id, base_sale_price, item_type, requirement_1_name, requirement_1_value, requirement_2_name, requirement_2_value, requirement_3_name, requirement_3_value, item_type_id_ammo, spell_id_on_hit, spell_on_hit_prob, spell_id_feature, spell_feature_charges, spell_feature_timing, item_anim_id, description, sound, item_max_quality, equip_script, consume_script, creative_definition, max_charges, weapon_range"; if (db->Command("INSERT INTO item_stats (%s) SELECT %s FROM item_stats WHERE id = %u", fields, fields, id) == QUERY_FAILED) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-12-12 07:49:14
|
Revision: 4942 http://planeshift.svn.sourceforge.net/planeshift/?rev=4942&view=rev Author: weltall2 Date: 2009-12-12 07:49:05 +0000 (Sat, 12 Dec 2009) Log Message: ----------- removed debug message finished the fix Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-12-12 07:48:11 UTC (rev 4941) +++ trunk/src/server/cachemanager.cpp 2009-12-12 07:49:05 UTC (rev 4942) @@ -1729,15 +1729,6 @@ newtrait->cstr_id_texture = FindCommonStringID(result[currentrow]["cstr_texture"]); newtrait->onlyNPC = result[currentrow].GetInt("only_npc") != 0; newtrait->shaderVar = result[currentrow]["shader"]; -printf("trait %d %d %d %s %s %s %s %d %s\n", result[currentrow].GetUInt32("id"), -result[currentrow].GetUInt32("next_trait"), -result[currentrow].GetUInt32("race_id"), -result[currentrow]["name"], -result[currentrow]["cstr_mesh"], -result[currentrow]["cstr_material"], -result[currentrow]["cstr_texture"], -result[currentrow].GetInt("only_npc"), -result[currentrow]["shader"]); psRaceInfo * raceInfo = GetRaceInfoByID(newtrait->raceID); if (raceInfo == NULL) { @@ -2658,7 +2649,7 @@ psItemStats* CacheManager::CopyItemStats(uint32 id, csString newName) { // NOTE: This -must- match the schema of item_stats, except for UNIQUE KEY 'name' which is handled below. - const char *fields = "stat_type, weight, visible_distance, size, container_max_size, valid_slots, flags, decay_rate, item_skill_id_1, item_skill_id_2, item_skill_id_3, item_bonus_1_attr, item_bonus_2_attr, item_bonus_3_attr, item_bonus_1_max, item_bonus_2_max, item_bonus_3_max, dmg_slash, dmg_blunt, dmg_pierce, weapon_speed, weapon_penetration, weapon_block_targeted, weapon_block_untargeted, weapon_counterblock, armor_hardness, cstr_gfx_mesh, cstr_id_gfx_icon, cstr_id_gfx_texture, cstr_id_part, cstr_id_part_mesh, armorvsweapon_type, category_id, base_sale_price, item_type, requirement_1_name, requirement_1_value, requirement_2_name, requirement_2_value, requirement_3_name, requirement_3_value, item_type_id_ammo, spell_id_on_hit, spell_on_hit_prob, spell_id_feature, spell_feature_charges, spell_feature_timing, item_anim_id, description, sound, item_max_quality, equip_script, consume_script, creative_definition, max_charges, weapon_range"; + const char *fields = "stat_type, weight, visible_distance, size, container_max_size, valid_slots, flags, decay_rate, item_skill_id_1, item_skill_id_2, item_skill_id_3, item_bonus_1_attr, item_bonus_2_attr, item_bonus_3_attr, item_bonus_1_max, item_bonus_2_max, item_bonus_3_max, dmg_slash, dmg_blunt, dmg_pierce, weapon_speed, weapon_penetration, weapon_block_targeted, weapon_block_untargeted, weapon_counterblock, armor_hardness, cstr_gfx_mesh, cstr_gfx_icon, cstr_gfx_texture, cstr_part, cstr_part_mesh, armorvsweapon_type, category_id, base_sale_price, item_type, requirement_1_name, requirement_1_value, requirement_2_name, requirement_2_value, requirement_3_name, requirement_3_value, item_type_id_ammo, spell_id_on_hit, spell_on_hit_prob, spell_id_feature, spell_feature_charges, spell_feature_timing, item_anim_id, description, sound, item_max_quality, equip_script, consume_script, creative_definition, max_charges, weapon_range"; if (db->Command("INSERT INTO item_stats (%s) SELECT %s FROM item_stats WHERE id = %u", fields, fields, id) == QUERY_FAILED) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ac...@us...> - 2010-03-03 23:13:03
|
Revision: 5646 http://planeshift.svn.sourceforge.net/planeshift/?rev=5646&view=rev Author: acraig Date: 2010-03-03 23:12:56 +0000 (Wed, 03 Mar 2010) Log Message: ----------- Added more detailed message about a failure condition. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-01 23:06:32 UTC (rev 5645) +++ trunk/src/server/cachemanager.cpp 2010-03-03 23:12:56 UTC (rev 5646) @@ -510,6 +510,7 @@ if (!result.IsValid()) { + Error1("CacheManager failed to get a list of sectors from the database. Check table <sectors>"); return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ac...@us...> - 2010-03-03 23:32:11
|
Revision: 5647 http://planeshift.svn.sourceforge.net/planeshift/?rev=5647&view=rev Author: acraig Date: 2010-03-03 23:32:04 +0000 (Wed, 03 Mar 2010) Log Message: ----------- Added more detailed message about a failure condition. Specifically on missing database information. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-03 23:12:56 UTC (rev 5646) +++ trunk/src/server/cachemanager.cpp 2010-03-03 23:32:04 UTC (rev 5647) @@ -425,6 +425,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >skills<"); return false; } @@ -473,6 +474,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >character_limitations<"); return false; } @@ -510,7 +512,7 @@ if (!result.IsValid()) { - Error1("CacheManager failed to get a list of sectors from the database. Check table <sectors>"); + Error1("Could not cache database table. Check >sectors<"); return false; } @@ -568,6 +570,7 @@ Result modes(db->Select("SELECT * FROM movement_modes")); if ( !modes.IsValid() ) { + Error1("Could not cache database table. Check >movement_modes<"); return false; } if ( !modes.Count() ) @@ -674,6 +677,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >armor_vs_weapon<"); return false; } @@ -715,6 +719,7 @@ if(!result.IsValid()) { + Error1("Could not cache database table. Check >stances<"); return false; } @@ -747,6 +752,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >quests<"); return false; } @@ -865,7 +871,7 @@ Result result(db->Select("select * from trade_combinations order by pattern_id, result_id, item_id")); if (!result.IsValid()) { - Error1("No data in trade_combinations could be found"); + Error1("Could not cache database table. Check >trade_combinations<"); } else { @@ -924,7 +930,7 @@ Result result(db->Select("select * from trade_transformations order by pattern_id, item_id")); if (!result.IsValid()) { - Error1("No data in trade_transformations could be found"); + Error1("Could not cache database table. Check >trade_transformations<"); } else { @@ -987,7 +993,7 @@ Result result(db->Select("select id from trade_patterns order by id")); if (!result.IsValid()) { - Error1("No data in trade_patterns could be found"); + Error1("Could not cache database table. Check >trade_patterns<"); } else { @@ -1054,7 +1060,7 @@ Result result(db->Select("select * from trade_processes order by process_id, subprocess_number")); if (!result.IsValid()) { - Error1("No data in trade_processes could be found"); + Error1("Could not cache database table. Check >trade_process<"); } else { @@ -1101,7 +1107,7 @@ Result result(db->Select("select * from trade_patterns order by designitem_id")); if (!result.IsValid()) { - Error1("Invalid select from trade patterns."); + Error1("Could not cache database table. Check >trade_patterns<"); } else { @@ -1511,6 +1517,7 @@ Result result(db->Select("select tip from tips where id<1000")); if (!result.IsValid()) { + Error1("Could not cache database table. Check >tips<"); return false; } @@ -1717,6 +1724,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >traits<"); return false; } @@ -1841,6 +1849,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >race_info<"); return false; } @@ -2504,6 +2513,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >item_animations<"); return false; } @@ -2618,6 +2628,7 @@ if (!result.IsValid()) { + Error1("Could not cache database table. Check >item_stats<"); return false; } @@ -2705,7 +2716,7 @@ if (!result.IsValid()) { - Error1("Couldn't load bad names!"); + Error1("Could not cache database table. Check >bad_names<"); return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-19 10:54:35
|
Revision: 5704 http://planeshift.svn.sourceforge.net/planeshift/?rev=5704&view=rev Author: weltall2 Date: 2010-03-19 10:54:29 +0000 (Fri, 19 Mar 2010) Log Message: ----------- removed some hardcoding Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-18 18:12:31 UTC (rev 5703) +++ trunk/src/server/cachemanager.cpp 2010-03-19 10:54:29 UTC (rev 5704) @@ -2333,46 +2333,8 @@ psWay *way = new psWay; way->id = atoi(ways[i]["id"]); way->name = ways[i]["name"]; - if (way->name == "Crystal") - { - way->skill = PSSKILL_CRYSTALWAY; - way->related_stat = PSITEMSTATS_STAT_CHARISMA; - } - else - if (way->name == "Azure") - { - way->skill = PSSKILL_AZUREWAY; - way->related_stat = PSITEMSTATS_STAT_WILL; - } - else - if (way->name == "Red") - { - way->skill = PSSKILL_REDWAY; - way->related_stat = PSITEMSTATS_STAT_WILL; - } - else - if (way->name == "Dark") - { - way->skill = PSSKILL_DARKWAY; - way->related_stat = PSITEMSTATS_STAT_CHARISMA; - } - else - if (way->name == "Brown") - { - way->skill = PSSKILL_BROWNWAY; - way->related_stat = PSITEMSTATS_STAT_INTELLIGENCE; - } - else - if (way->name == "Blue") - { - way->skill = PSSKILL_BLUEWAY; - way->related_stat = PSITEMSTATS_STAT_INTELLIGENCE; - } - else - { - Error2("Unknown WAY: %s",way->name.GetData()); - } - + way->skill = (PSSKILL)atoi(ways[i]["skill"]); + way->related_stat = (PSITEMSTATS_STAT)atoi(ways[i]["related_stat"]); wayList.Push(way); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-20 10:01:52
|
Revision: 5715 http://planeshift.svn.sourceforge.net/planeshift/?rev=5715&view=rev Author: weltall2 Date: 2010-03-20 10:01:46 +0000 (Sat, 20 Mar 2010) Log Message: ----------- missing one thing Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-20 09:59:50 UTC (rev 5714) +++ trunk/src/server/cachemanager.cpp 2010-03-20 10:01:46 UTC (rev 5715) @@ -493,9 +493,9 @@ optionEntry *optionEntry::getOptionSafe(const csString path, csString fallback) { //try to get the option normally - optionEntry *Entry = getOption(path) + optionEntry *Entry = getOption(path); if(Entry) //we found it all done - return Entry + return Entry; //try to make a new entry and assign the fallback setOption(path, fallback); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-22 17:58:57
|
Revision: 5731 http://planeshift.svn.sourceforge.net/planeshift/?rev=5731&view=rev Author: weltall2 Date: 2010-03-22 17:58:44 +0000 (Mon, 22 Mar 2010) Log Message: ----------- fixed build Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-22 13:27:58 UTC (rev 5730) +++ trunk/src/server/cachemanager.cpp 2010-03-22 17:58:44 UTC (rev 5731) @@ -503,16 +503,16 @@ return getOption(path); } -csVector3 getValueAsVector() +csVector3 optionEntry::getValueAsVector() { //split the array each , csStringArray cordArray; - cordArray.SplitString(GetValue(),","); + cordArray.SplitString(getValue(),","); //if there are enough string to do 3 cordinates parse them and stuff them in a csVector3 - if(deathcordarray.GetSize() > 2) - return csVector3(atof(deathcordarray.Get(0)), atof(deathcordarray.Get(1)), atof(deathcordarray.Get(2))); + if(cordArray.GetSize() > 2) + return csVector3(atof(cordArray.Get(0)), atof(cordArray.Get(1)), atof(cordArray.Get(2))); //in case the data is bad just return 0,0,0 - return csVector(0,0,0); + return csVector3(0,0,0); } bool CacheManager::PreloadSkills() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-24 05:56:51
|
Revision: 5735 http://planeshift.svn.sourceforge.net/planeshift/?rev=5735&view=rev Author: weltall2 Date: 2010-03-24 05:56:45 +0000 (Wed, 24 Mar 2010) Log Message: ----------- added an error output Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-24 05:53:36 UTC (rev 5734) +++ trunk/src/server/cachemanager.cpp 2010-03-24 05:56:45 UTC (rev 5735) @@ -512,6 +512,7 @@ if(cordArray.GetSize() > 2) return csVector3(atof(cordArray.Get(0)), atof(cordArray.Get(1)), atof(cordArray.Get(2))); //in case the data is bad just return 0,0,0 + Error2("Server option is not a valid vector (%s should be like x,y,z)", getValue()); return csVector3(0,0,0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-03-24 05:58:49
|
Revision: 5736 http://planeshift.svn.sourceforge.net/planeshift/?rev=5736&view=rev Author: weltall2 Date: 2010-03-24 05:58:42 +0000 (Wed, 24 Mar 2010) Log Message: ----------- missing piece Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-03-24 05:56:45 UTC (rev 5735) +++ trunk/src/server/cachemanager.cpp 2010-03-24 05:58:42 UTC (rev 5736) @@ -512,7 +512,7 @@ if(cordArray.GetSize() > 2) return csVector3(atof(cordArray.Get(0)), atof(cordArray.Get(1)), atof(cordArray.Get(2))); //in case the data is bad just return 0,0,0 - Error2("Server option is not a valid vector (%s should be like x,y,z)", getValue()); + Error2("Server option is not a valid vector (%s should be like x,y,z)", getValue().GetData()); return csVector3(0,0,0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-05 21:03:58
|
Revision: 6355 http://planeshift.svn.sourceforge.net/planeshift/?rev=6355&view=rev Author: weltall2 Date: 2010-11-05 21:03:50 +0000 (Fri, 05 Nov 2010) Log Message: ----------- removed entirely the remains of code Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-11-05 20:54:10 UTC (rev 6354) +++ trunk/src/server/cachemanager.cpp 2010-11-05 21:03:50 UTC (rev 6355) @@ -2728,7 +2728,7 @@ Error3("Error loading world items.\nQuery: %s\nError: %s",db->GetLastQuery(), db->GetLastError() ); return false; } -printf("here\n"); + for (unsigned long i = 0; i < result.Count(); i++) { psItem *item; @@ -2760,11 +2760,7 @@ items.Push(item); } -/* - for (size_t i=0; i < items.GetSize(); i++) - { - items[i]->SetLoaded(); - }*/ + return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-09 20:15:17
|
Revision: 6373 http://planeshift.svn.sourceforge.net/planeshift/?rev=6373&view=rev Author: weltall2 Date: 2010-11-09 20:15:10 +0000 (Tue, 09 Nov 2010) Log Message: ----------- Fixed typo in the last patch Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2010-11-09 19:57:03 UTC (rev 6372) +++ trunk/src/server/cachemanager.cpp 2010-11-09 20:15:10 UTC (rev 6373) @@ -399,7 +399,7 @@ { csHash<psSkillInfo*, int>::GlobalIterator it(skillinfo_IDHash.GetIterator()); - while(it.hasNext()) + while(it.HasNext()) delete it.Next(); skillinfo_IDHash.DeleteAll(); skillinfo_NameHash.DeleteAll(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2011-03-11 13:29:11
|
Revision: 7075 http://planeshift.svn.sourceforge.net/planeshift/?rev=7075&view=rev Author: weltall2 Date: 2011-03-11 13:29:05 +0000 (Fri, 11 Mar 2011) Log Message: ----------- fixed parameter Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2011-03-11 08:39:35 UTC (rev 7074) +++ trunk/src/server/cachemanager.cpp 2011-03-11 13:29:05 UTC (rev 7075) @@ -630,7 +630,7 @@ //check if there is a valid cost_script if(!psserver->GetMathScriptEngine()->FindScript(newskill->costScript)) { - Error3("Unknown script '%s' for skill id %u", newskill->costScript, newskill->id); + Error3("Unknown script '%s' for skill id %u", newskill->costScript.GetData(), newskill->id); delete newskill; return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2012-02-10 15:50:23
|
Revision: 8074 http://planeshift.svn.sourceforge.net/planeshift/?rev=8074&view=rev Author: weltall2 Date: 2012-02-10 15:50:12 +0000 (Fri, 10 Feb 2012) Log Message: ----------- removed deletion of smartpointers... Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2012-02-09 20:44:30 UTC (rev 8073) +++ trunk/src/server/cachemanager.cpp 2012-02-10 15:50:12 UTC (rev 8074) @@ -347,15 +347,7 @@ alliance_by_id.Empty(); } - { - csHash<csRef<psGuildInfo> >::GlobalIterator it (guildinfo_by_id.GetIterator ()); - while (it.HasNext ()) - { - psGuildInfo* guildinfo = it.Next (); - delete guildinfo; - } - guildinfo_by_id.Empty(); - } + guildinfo_by_id.Empty(); { csHash<psItemStats *, csString>::GlobalIterator it (itemStats_NameHash.GetIterator ()); @@ -3206,7 +3198,6 @@ void CacheManager::RemoveGuild(psGuildInfo *which) { guildinfo_by_id.Delete(which->GetID(),which); - delete which; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2012-04-08 15:38:44
|
Revision: 8193 http://planeshift.svn.sourceforge.net/planeshift/?rev=8193&view=rev Author: magodra Date: 2012-04-08 15:38:38 +0000 (Sun, 08 Apr 2012) Log Message: ----------- - Added more checks to RaceInfo BaseSpeed loading. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2012-04-08 14:49:11 UTC (rev 8192) +++ trunk/src/server/cachemanager.cpp 2012-04-08 15:38:38 UTC (rev 8193) @@ -2153,12 +2153,24 @@ if (newraceinfo->Load(result[currentrow])) { - newraceinfo->LoadBaseSpeeds(psserver->GetObjectReg()); + // Do not load the BaseSpeeds for the Special raceinfo + // that allow imaginary NPCs without race to be created. + if (strcmp(newraceinfo->GetName(),"Special")!=0) + { + if (!newraceinfo->LoadBaseSpeeds(psserver->GetObjectReg())) + { + Error2("Could not load base speeds for raceinfo %s.",newraceinfo->GetName()); + return false; + } + } + raceinfolist.Push(newraceinfo); } else { + Error1("Could not load raceinfo. Check >race_info<"); delete newraceinfo; + return false; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2012-12-19 18:30:53
|
Revision: 8515 http://planeshift.svn.sourceforge.net/planeshift/?rev=8515&view=rev Author: lpancallo Date: 2012-12-19 18:30:46 +0000 (Wed, 19 Dec 2012) Log Message: ----------- bool functions should return a value. Assumed true for now. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2012-12-19 18:24:17 UTC (rev 8514) +++ trunk/src/server/cachemanager.cpp 2012-12-19 18:30:46 UTC (rev 8515) @@ -1689,6 +1689,8 @@ newArray->Push(craftInfo); } } + + return true; } bool CacheManager::DescribeCombination( Result* combinations, csArray<CraftTransInfo*>* newArray ) @@ -1703,6 +1705,8 @@ newArray->Push(craftInfo); //printf( "DEBUG: Describe Combination : %s\n", craftInfo->craftStepDescription.GetData() ); + + return true; } /** List the steps to produce an item. @@ -1770,6 +1774,8 @@ } } itemStack->Pop(); + + return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lpa...@us...> - 2013-01-06 23:33:56
|
Revision: 8536 http://planeshift.svn.sourceforge.net/planeshift/?rev=8536&view=rev Author: lpancallo Date: 2013-01-06 23:33:49 +0000 (Sun, 06 Jan 2013) Log Message: ----------- alphabetical order of final items in crafting books by Eredin Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2013-01-06 19:41:07 UTC (rev 8535) +++ trunk/src/server/cachemanager.cpp 2013-01-06 23:33:49 UTC (rev 8536) @@ -1440,23 +1440,33 @@ return tradePatterns_NameHash.Get(name,NULL); } -/** Insert the itemID into the finalItems array only if it isn't already included. - * + +/** Insert Sorted Unique + * Insert the itemID into an array, sorted according the the item's Name, no more than one time. */ bool CacheManager::UniqueInsertIntoItemArray(csArray<uint32>* finalItems, uint32 itemID) { if(itemID==0) return false; + psItemStats* NewStats = GetBasicItemStatsByID(itemID); + for(int i=0; i<finalItems->GetSize(); i++) { - if(finalItems->Get(i) == itemID) + psItemStats* CurrStats; + if(finalItems->Get(i) == itemID) //already in list { return false; } + CurrStats = GetBasicItemStatsByID(finalItems->Get(i)); +//printf( "--DEBUG: UniqueInsertIntoItemArray comparing (item %i)%s to %s\n", itemID, NewStats->GetName(), CurrStats->GetName() ); + if( strcmp(NewStats->GetName(),CurrStats->GetName())<1 ) + { + finalItems->Insert( i, itemID ); //insert before current item + return true; + } } //printf( "--DEBUG: UniqueInsertIntoItemArray : %i\n", itemID ); - finalItems->Push(itemID); - return true; + finalItems->Push(itemID); return true; } /** Check if an int value is already in an array This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-01-02 19:11:12
|
Revision: 9176 http://sourceforge.net/p/planeshift/code/9176 Author: ralphcampbell Date: 2014-01-02 19:11:09 +0000 (Thu, 02 Jan 2014) Log Message: ----------- Fix CID 1138881 by deleting craftInfo if error. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2014-01-02 02:06:21 UTC (rev 9175) +++ trunk/src/server/cachemanager.cpp 2014-01-02 19:11:09 UTC (rev 9176) @@ -1749,7 +1749,6 @@ // uint32 resultID = t->GetResultId(); csArray<psTradeProcesses*>* procArray = GetTradeProcessesByID(processID); - CraftTransInfo* craftInfo; if(procArray) { @@ -1758,7 +1757,7 @@ psTradeProcesses* proc = procArray->Get(k); if(proc->GetSubprocessId()==0) { - craftInfo = new CraftTransInfo; + CraftTransInfo* craftInfo = new CraftTransInfo; craftInfo->priSkillId = proc->GetPrimarySkillId(); craftInfo->minPriSkill = proc->GetMinPrimarySkill(); @@ -1771,6 +1770,8 @@ craftInfo->craftStepDescription.Insert(0, " "); newArray->Push(craftInfo); } + else + delete craftInfo; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-01-02 19:15:32
|
Revision: 9177 http://sourceforge.net/p/planeshift/code/9177 Author: ralphcampbell Date: 2014-01-02 19:15:30 +0000 (Thu, 02 Jan 2014) Log Message: ----------- Fix CID 1138880 by deleting craftInfo if error. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2014-01-02 19:11:09 UTC (rev 9176) +++ trunk/src/server/cachemanager.cpp 2014-01-02 19:15:30 UTC (rev 9177) @@ -1979,6 +1979,8 @@ craftInfo->craftStepDescription.Append(".\n"); newArray->Push(craftInfo); } + else + delete craftInfo; return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2014-02-04 17:16:58
|
Revision: 9237 http://sourceforge.net/p/planeshift/code/9237 Author: ralphcampbell Date: 2014-02-04 17:16:55 +0000 (Tue, 04 Feb 2014) Log Message: ----------- Remove debug printf. Modified Paths: -------------- trunk/src/server/cachemanager.cpp Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2014-02-04 17:06:45 UTC (rev 9236) +++ trunk/src/server/cachemanager.cpp 2014-02-04 17:16:55 UTC (rev 9237) @@ -477,8 +477,6 @@ for(size_t j = 0; j < restrainResult.Count(); j++) { - printf("restrain %d %c\n", restrainResult[j].GetUInt32("item_id"), - *restrainResult[j]["allowed"]); // XXX entry->itemRestrain.PutUnique(restrainResult[j].GetUInt32("item_id"), *restrainResult[j]["allowed"] == 'Y'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |